From 9219488d53d9ab234321ca1bb0b7322a9a2d1882 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 13:50:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/common/web/BaseController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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..ca4ec88 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -85,10 +85,8 @@
     }
 
     protected Long getDeptId() {
-        // todo:luxiaotao
-        return 1L;
+        return getUser().getDeptId();
     }
-
 
     protected String getComment(Class<?> cls, String fieldName){
         Field[] fields = Cools.getAllFields(cls);
@@ -113,7 +111,7 @@
     }
 
     protected Dept getOriginDept(){
-        Dept dept = deptService.getTop();
+        Dept dept = deptService.getTop(getHostId());
         if (dept == null) {
             throw new CoolException("閮ㄩ棬鏁版嵁閿欒");
         }
@@ -189,6 +187,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