From 68bc54a257d7b137d2e889a8b037a1a49822012f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 19 十一月 2022 10:13:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 3 +--
src/main/java/com/zy/crm/system/service/impl/RoleServiceImpl.java | 7 +++++++
src/main/java/com/zy/crm/system/entity/Role.java | 7 +++++--
src/main/java/com/zy/crm/system/service/RoleService.java | 2 ++
src/main/java/com/zy/crm/manager/controller/OrderController.java | 3 +--
5 files changed, 16 insertions(+), 6 deletions(-)
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 0f3ea78..5fa5d2a 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -10,7 +10,6 @@
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;
@@ -321,7 +320,7 @@
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
+ , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
, condition);
List<KeyValueVo> vos = new ArrayList<>();
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 92fa361..9ff6024 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -10,7 +10,6 @@
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;
@@ -138,7 +137,7 @@
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
+ , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
, condition);
List<KeyValueVo> vos = new ArrayList<>();
diff --git a/src/main/java/com/zy/crm/system/entity/Role.java b/src/main/java/com/zy/crm/system/entity/Role.java
index 7c5a3fd..3527570 100644
--- a/src/main/java/com/zy/crm/system/entity/Role.java
+++ b/src/main/java/com/zy/crm/system/entity/Role.java
@@ -41,7 +41,7 @@
private Long leader;
/**
- * 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
+ * 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
*/
@ApiModelProperty(value= "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
private Short level;
@@ -129,5 +129,8 @@
this.level = level;
}
-
+ public boolean judgeLeader() {
+ RoleService service = SpringUtils.getBean(RoleService.class);
+ return service.judgeLeader(this.id);
+ }
}
diff --git a/src/main/java/com/zy/crm/system/service/RoleService.java b/src/main/java/com/zy/crm/system/service/RoleService.java
index ce0a230..0a72dd6 100644
--- a/src/main/java/com/zy/crm/system/service/RoleService.java
+++ b/src/main/java/com/zy/crm/system/service/RoleService.java
@@ -10,4 +10,6 @@
List<User> getUserByRoleCode(Long hostId, Long deptId, Long userId);
+ Boolean judgeLeader(Long roleId);
+
}
diff --git a/src/main/java/com/zy/crm/system/service/impl/RoleServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/RoleServiceImpl.java
index 02b3021..2b6b684 100644
--- a/src/main/java/com/zy/crm/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/RoleServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.crm.common.model.enums.RoleType;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.mapper.RoleMapper;
@@ -42,4 +43,10 @@
}
}
+ @Override
+ public Boolean judgeLeader(Long roleId) {
+ Role role = this.selectById(roleId);
+ return (role.getCode().equals(RoleType.boss.toString()) || role.getCode().equals(RoleType.manager.toString()));
+ }
+
}
--
Gitblit v1.9.1