lishuangjiang@potevio.com 1 год назад
Родитель
Сommit
0f25ecb053

+ 2 - 0
iot-common-core/src/main/java/cc/iotkit/common/constant/GlobalConstants.java

@@ -34,4 +34,6 @@ public interface GlobalConstants {
 
 
     String DEPT_CHILD_PREFIX = GLOBAL_REDIS_KEY + "dept_child_prefix:";
+
+    String DEPT_INFO_PREFIX = GLOBAL_REDIS_KEY + "dept_info_prefix:";
 }

+ 6 - 2
iot-common-tenant/src/main/java/cc/iotkit/common/tenant/listener/TenantListener.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.persistence.PrePersist;
 import javax.persistence.PreRemove;
+import java.util.Objects;
 
 @Slf4j
 public class TenantListener {
@@ -23,9 +24,12 @@ public class TenantListener {
         if (StringUtils.isNotBlank(dynamic)) {
             tenantId = dynamic;
         }
-        if (!"000000".equals(tenantId) && tenantId != null) {
+        if (!"-1".equals(tenantId) && !"000000".equals(tenantId) && tenantId != null) {
             entity.setTenantId(tenantId);
         }
-        entity.setCreateDept(createDept);
+        if (Objects.nonNull(createDept) && createDept!=-1){
+            entity.setCreateDept(createDept);
+        }
+
     }
 }