From cb3870820f63e6f7ba595d80dcbbfd3deae6fdf6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 07 十一月 2023 17:49:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CompanyController.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CompanyController.java b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
index b455a12..588cf35 100644
--- a/src/main/java/com/zy/crm/manager/controller/CompanyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
@@ -9,6 +9,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.core.domain.KeyValueVo;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.entity.Company;
 import com.zy.crm.manager.service.CompanyService;
@@ -59,7 +60,7 @@
     }
 
     @RequestMapping(value = "/company/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "娣诲姞鍏徃")
     public R add(Company company) {
         company.setHostId(getHostId());
         company.setCreateBy(getUserId());
@@ -72,7 +73,7 @@
     }
 
 	@RequestMapping(value = "/company/update/auth")
-	@ManagerAuth
+	@ManagerAuth(memo = "鏇存柊鍏徃")
     public R update(Company company){
         if (Cools.isEmpty(company) || null==company.getId()){
             return R.error();
@@ -84,7 +85,7 @@
     }
 
     @RequestMapping(value = "/company/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍒犻櫎鍏徃")
     public R delete(@RequestParam(value="ids[]") Long[] ids){
          for (Long id : ids){
             companyService.deleteById(id);
@@ -114,6 +115,7 @@
             Map<String, Object> map = new HashMap<>();
             map.put("id", company.getId());
             map.put("value", company.getId());
+            map.put("name", company.getName());
             result.add(map);
         }
         return R.ok(result);
@@ -129,4 +131,19 @@
         return R.ok();
     }
 
+    // xm-select
+    @RequestMapping("/company/all/get/kv")
+    @ManagerAuth
+    public R getDataKV(@RequestParam(required = false) String condition) {
+        Wrapper<Company> wrapper = new EntityWrapper<Company>()
+                .andNew().like("name", condition).or().like("uuid", condition)
+                .orderBy("create_time", false);
+        List<Company> items = companyService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+        List<KeyValueVo> valueVos = new ArrayList<>();
+        for (Company item : items) {
+            valueVos.add(new KeyValueVo(item.getName(), item.getId()));
+        }
+        return R.ok().add(valueVos);
+    }
+
 }

--
Gitblit v1.9.1