修改企业和部门接口

web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java

@@ -37,9 +37,13 @@ public class DepartmentAddExe {
     @Transactional(rollbackFor = Exception.class)
     public boolean execute(DepartmentAddCmd cmd) {
         DepartmentE examTypeE = new DepartmentE();
-     /*   if(examTypeE.getParentId()==null){
-            examTypeE.setParentId(AuthContext.getTenantId());
-        }*/
+        //TODO 父id的值待定
+//        if(examTypeE.getParentId()==null){
+//            examTypeE.setParentId(AuthContext.getTenantId());
+//        }
+        if(cmd.getCorpinfoId() == null){
+            cmd.setCorpinfoId(AuthContext.getTenantId());
+        }
         BeanUtils.copyProperties(cmd, examTypeE);
         Long id = null;
         try {

web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java

@@ -60,7 +60,8 @@ public class DepartmentQueryExe {
             return Collections.emptyList();
         }
         List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse);
-        return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList");
+        //GBS部门第一次是1
+        return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",1);
     }
 
 

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java

@@ -29,7 +29,7 @@ public class DepartmentAddCmd extends Command {
     @NotEmpty(message = "名称不能为空")
     private String name;
     @ApiModelProperty(value = "父部门id", name = "parentId", required = true)
-    @NotNull(message = "父部门id不能为空")
+//    @NotNull(message = "父部门id不能为空")
     private Long parentId;
 
     @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true)