fix

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -190,43 +190,34 @@ public class DepartmentContoller extends WebBaseController{
 		if(StringUtils.isNotBlank(addDepartment)) {
 			List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class);
 			for (DepartmentAddQO departmentAddQO : list) {
-				boolean addFlag = departmentAddQO.getAddFlag();
-				if(addFlag){
-					String parentId = departmentAddQO.getParentId();
-					DepartmentDTO dto = departmentApiService.selectById(parentId);
-					if(dto == null || dto.getStatusFlag() == 0) {
-						continue;
-					}
-					if(dto.getIsStore() == 1) {
-						continue;
-					}
-					DepartmentDTO department = new DepartmentDTO();
-					department.setParentDepartmentId(parentId);
-					//department.setWxDepartmentId(dto.getWxDepartmentId());
-					department.setWxEnterpriseId(dto.getWxEnterpriseId());
-					department.setDepartmentName(departmentAddQO.getDepartmentName());
-					department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
-					department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
-					department.setIsStore(0);
-					department.setIsStore(departmentAddQO.getStoreFlag());
-					department.setLevel(dto.getLevel() + 1);
-					department.setRelatedId(departmentAddQO.getRelatedId());
-					HaobanResponse hr = departmentApiService.add(department);
-					if(hr.getErrorCode() != 1) {
-						continue;
-					}
-					DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
-					String departmentId = departmentAdd.getDepartmentId();
-					
-					String sonDepartment = departmentAddQO.getSonDepartment();
-					handler(sonDepartment,departmentId);
-				}else{
-					String departmentId = departmentAddQO.getDepartmentId();
-					DepartmentDTO dto = departmentApiService.selectById(departmentId);
-					dto.setSort(departmentAddQO.getSort());
-					String sonDepartment = departmentAddQO.getSonDepartment();
-					handler(sonDepartment,departmentId);
+				String parentId = departmentAddQO.getParentId();
+				DepartmentDTO dto = departmentApiService.selectById(parentId);
+				if(dto == null || dto.getStatusFlag() == 0) {
+					continue;
 				}
+				if(dto.getIsStore() == 1) {
+					continue;
+				}
+				DepartmentDTO department = new DepartmentDTO();
+				department.setParentDepartmentId(parentId);
+				//department.setWxDepartmentId(dto.getWxDepartmentId());
+				department.setWxEnterpriseId(dto.getWxEnterpriseId());
+				department.setDepartmentName(departmentAddQO.getDepartmentName());
+				department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
+				department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
+				department.setIsStore(0);
+				department.setIsStore(departmentAddQO.getStoreFlag());
+				department.setLevel(dto.getLevel() + 1);
+				department.setRelatedId(departmentAddQO.getRelatedId());
+				HaobanResponse hr = departmentApiService.add(department);
+				if(hr.getErrorCode() != 1) {
+					continue;
+				}
+				DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
+				String departmentId = departmentAdd.getDepartmentId();
+				
+				String sonDepartment = departmentAddQO.getSonDepartment();
+				handler(sonDepartment,departmentId);
 			}
 		}
 		logger.info("【部门修改】editDepartment={}",editDepartment);