From 518b7a20ef1add6c6910eca89b1fef0fbd83e03d Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 01 一月 2023 07:03:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/web/BaseController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
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 f8df4a7..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) {
@@ -85,10 +89,16 @@
}
protected Long getDeptId() {
- // todo:luxiaotao
- return 1L;
+ 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);
@@ -113,7 +123,7 @@
}
protected Dept getOriginDept(){
- Dept dept = deptService.getTop();
+ Dept dept = deptService.getTop(getHostId());
if (dept == null) {
throw new CoolException("閮ㄩ棬鏁版嵁閿欒");
}
@@ -189,6 +199,9 @@
}
String column = null;
if (field.isAnnotationPresent(TableField.class)) {
+ if (!field.getAnnotation(TableField.class).exist()) {
+ continue;
+ }
column = field.getAnnotation(TableField.class).value();
}
if (Cools.isEmpty(column)) {
--
Gitblit v1.9.1