18339543638 3 vuotta sitten
vanhempi
commit
cb5e6f16f5

+ 2 - 1
nb-service/web-service/src/main/java/com/nb/web/service/system/entity/SysDept.java

@@ -6,6 +6,7 @@ import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.nb.core.enums.StatusEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -94,7 +95,7 @@ public class SysDept extends TenantGenericEntity<Long,String>{
     /**
      * 状态 0正常;1停用
      */
-    private String status;
+    private StatusEnum status;
 
     /**
      * 创建人

+ 2 - 2
nb-service/web-service/src/main/java/com/nb/web/service/system/service/impl/SysDeptServiceImpl.java

@@ -86,7 +86,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         }
         if (req.getStatus().equals(StatusEnum.NO.getValue()) &&
                 this.list(Wrappers.lambdaQuery(SysDept.class)
-                        .eq(SysDept::getStatus, StatusEnum.YES.getValue())
+                        .eq(SysDept::getStatus, StatusEnum.YES)
                         .apply("find_in_set({0}, ancestors)", req.getId())).size() > 0) {
             throw new CustomException("该部门存在未停用的下级部门");
         }
@@ -110,7 +110,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         List<SysDept> parentList = Arrays.asList(entity.getAncestors().split(",")).stream().map(item -> {
             SysDept sysDeptTemp = new SysDept();
             sysDeptTemp.setId(Long.parseLong(item));
-            sysDeptTemp.setStatus(StatusEnum.YES.getValue());
+            sysDeptTemp.setStatus(StatusEnum.YES);
             return sysDeptTemp;
         }).collect(Collectors.toList());
         this.updateBatchById(parentList);