From 3161b295e6e443c72d8c1cb302521a5184dbec0e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 21:37:29 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java | 16 ++++++++++++++++
zy-asrs-framework/src/main/resources/templates/Controller.txt | 4 +++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
index 11f370d..ece2a14 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.domain.KeyValueVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -135,4 +136,19 @@
return R.ok(result);
}
+ /*************************************** xm-select ***********************************************/
+
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/user/all/get/kv")
+ @ManagerAuth
+ public R getUserDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(User::getUsername, condition);
+ }
+ userService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getUsername()), item.getId())));
+ return R.ok().add(vos);
+ }
+
}
diff --git a/zy-asrs-framework/src/main/resources/templates/Controller.txt b/zy-asrs-framework/src/main/resources/templates/Controller.txt
index 5b40eb5..d18ce7f 100644
--- a/zy-asrs-framework/src/main/resources/templates/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Controller.txt
@@ -95,7 +95,9 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
+ }
@{SIMPLEENTITYNAME}Service.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{MAJORCOLUMN0}()), item.get@{PRIMARYKEYCOLUMN}())));
return R.ok().add(vos);
}
--
Gitblit v1.9.1