添加打包配置文件

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptTreeSelect.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import com.mortals.xhx.module.dept.model.vo.DeptVo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import org.springframework.util.ObjectUtils;
+
 import java.io.Serializable;
 import java.util.stream.Collectors;
 /**
@@ -36,7 +38,9 @@ public class DeptTreeSelect  implements Serializable {
     public DeptTreeSelect(DeptEntity entity) {
         this.id = entity.getId();
         this.label = entity.getDeptName();
+        if(!ObjectUtils.isEmpty(entity.getChildren())){
             this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList());
         }
+    }
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -76,7 +76,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         if(!ObjectUtils.isEmpty(deptEntity)){
             deptEntity.setDeptStatus(DeptStatusEnum.启用.getValue());
             deptEntity.setUpdateTime(new Date());
-            deptEntity.setUpdateUser(context.getUser().getLoginName());
+            deptEntity.setUpdateUser(context==null?"admin":context.getUser().getLoginName());
             DeptEntity condition = new DeptEntity();
             condition.setId(deptEntity.getId());
             this.updateBatch(deptEntity, condition, context);