From 07fcb01a51bf4b9102b41e9223d66b16af9548f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 19 十一月 2022 10:09:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/common/model/enums/RoleType.java        |   10 ++++++++++
 src/main/resources/mapper/OrderMapper.xml                        |    3 ---
 src/main/java/com/zy/crm/common/web/BaseController.java          |   12 ++++++++++++
 src/main/java/com/zy/crm/manager/controller/CstmrController.java |   12 ++++++++++--
 src/main/webapp/static/js/plan/plan.js                           |    2 +-
 src/main/java/com/zy/crm/manager/controller/OrderController.java |   18 ++++++++++++++++++
 6 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/crm/common/model/enums/RoleType.java b/src/main/java/com/zy/crm/common/model/enums/RoleType.java
new file mode 100644
index 0000000..123c515
--- /dev/null
+++ b/src/main/java/com/zy/crm/common/model/enums/RoleType.java
@@ -0,0 +1,10 @@
+package com.zy.crm.common.model.enums;
+
+public enum RoleType {
+
+    boss,
+    manager,
+    salesman,
+    ;
+
+}
diff --git a/src/main/java/com/zy/crm/common/web/BaseController.java b/src/main/java/com/zy/crm/common/web/BaseController.java
index ca4ec88..eab395b 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -8,7 +8,9 @@
 import com.core.controller.AbstractBaseController;
 import com.core.exception.CoolException;
 import com.zy.crm.system.entity.Dept;
+import com.zy.crm.system.entity.Role;
 import com.zy.crm.system.service.DeptService;
+import com.zy.crm.system.service.RoleService;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.zy.crm.manager.entity.Node;
@@ -44,6 +46,8 @@
     private DeptService deptService;
     @Autowired
     private UserLoginService userLoginService;
+    @Autowired
+    private RoleService roleService;
 
     protected Long getHostId(){
         if (getUserId() == 9527) {
@@ -88,6 +92,14 @@
         return getUser().getDeptId();
     }
 
+    protected Role getRole(){
+        Role role = roleService.selectById(getUser().getRoleId());
+        if (null == role) {
+            throw new CoolException(BaseRes.DENIED);
+        }
+        return role;
+    }
+
     protected String getComment(Class<?> cls, String fieldName){
         Field[] fields = Cools.getAllFields(cls);
         for (Field field : fields){
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 09ed9c0..0f3ea78 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -10,6 +10,7 @@
 import com.core.common.R;
 import com.core.domain.KeyValueVo;
 import com.core.exception.CoolException;
+import com.zy.crm.common.model.enums.RoleType;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.controller.result.FollowerTableVo;
 import com.zy.crm.manager.entity.Cstmr;
@@ -19,6 +20,7 @@
 import com.zy.crm.manager.service.CstmrService;
 import com.zy.crm.manager.service.CstmrTypeService;
 import com.zy.crm.system.entity.Dic;
+import com.zy.crm.system.entity.Role;
 import com.zy.crm.system.entity.User;
 import com.zy.crm.system.service.DicService;
 import com.zy.crm.system.service.UserService;
@@ -315,9 +317,15 @@
     @RequestMapping("/cstmr/all/get/kv")
     @ManagerAuth
     public R getDataKV(@RequestParam(required = false) String condition) {
+        User user = getUser(); assert user != null;
+        Role role = getRole(); assert role != null;
+        Page<Cstmr> page = cstmrService.getPage(new Page<>(1, 30)
+                , getHostId()
+                , (role.getCode().equals(RoleType.boss.toString()) || role.getCode().equals(RoleType.manager.toString())) ? String.valueOf(user.getDeptId()) : null
+                , user.getId()
+                , condition);
         List<KeyValueVo> vos = new ArrayList<>();
-        Wrapper<Cstmr> wrapper = new EntityWrapper<Cstmr>().andNew().like("name", condition).or().like("uuid", condition).orderBy("create_time", false);
-        cstmrService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
+        page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
         return R.ok().add(vos);
     }
 
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 6c6865a..92fa361 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -8,13 +8,16 @@
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
+import com.core.domain.KeyValueVo;
 import com.core.exception.CoolException;
+import com.zy.crm.common.model.enums.RoleType;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.controller.result.FollowerTableVo;
 import com.zy.crm.manager.entity.Order;
 import com.zy.crm.manager.entity.OrderFoll;
 import com.zy.crm.manager.service.OrderFollService;
 import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.system.entity.Role;
 import com.zy.crm.system.entity.User;
 import com.zy.crm.system.service.UserService;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -128,6 +131,21 @@
         return R.ok();
     }
 
+    @RequestMapping("/order/all/get/kv")
+    @ManagerAuth
+    public R getDataKV(@RequestParam(required = false) String condition) {
+        User user = getUser(); assert user != null;
+        Role role = getRole(); assert role != null;
+        Page<Order> page = orderService.getPage(new Page<>(1, 30)
+                , getHostId()
+                , (role.getCode().equals(RoleType.boss.toString()) || role.getCode().equals(RoleType.manager.toString())) ? String.valueOf(user.getDeptId()) : null
+                , user.getId()
+                , condition);
+        List<KeyValueVo> vos = new ArrayList<>();
+        page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
+        return R.ok().add(vos);
+    }
+
     /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
 
     /**
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 20f3343..55e8538 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -81,10 +81,7 @@
             and (
             mo.uuid like concat('%',#{condition},'%')
             or mo.name like concat('%',#{condition},'%')
-            or mo.tel like concat('%',#{condition},'%')
-            or mo.contacts like concat('%',#{condition},'%')
             or mo.remarks like concat('%',#{condition},'%')
-            or mo.director like concat('%',#{condition},'%')
             or mo.addr like concat('%',#{condition},'%')
             )
         </if>
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 652771d..31bfe0e 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -148,7 +148,7 @@
             ,{field: 'uuid', align: 'center',title: '瑙勫垝鍗曚唬鍙�'}
             ,{field: 'appleTime$', align: 'center',title: '鐢宠鏃ユ湡'}
             // ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
-            ,{field: 'planner', align: 'center',title: '瑙勫垝鍛�'}
+            ,{field: 'planner', align: 'center',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
             // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
             // ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'}
             // ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'}

--
Gitblit v1.9.1