fix

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

@@ -190,35 +190,43 @@ public class DepartmentContoller extends WebBaseController{
 		if(StringUtils.isNotBlank(addDepartment)) {
 			List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class);
 			for (DepartmentAddQO departmentAddQO : list) {
-				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;
+				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);
 				}
-				DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
-				String departmentId = departmentAdd.getDepartmentId();
-				
-				String sonDepartment = departmentAddQO.getSonDepartment();
-				handler(sonDepartment,departmentId);
-				
 			}
 		}
 		logger.info("【部门修改】editDepartment={}",editDepartment);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/DepartmentAddQO.java

@@ -19,6 +19,8 @@ public class DepartmentAddQO implements Serializable {
 	private String relatedId;
 	
 	private Boolean addFlag;
+	
+	private Integer sort;
 
 	public String getDepartmentName() {
 		return departmentName;
@@ -51,6 +53,16 @@ public class DepartmentAddQO implements Serializable {
 	public void setDepartmentId(String departmentId) {
 		this.departmentId = departmentId;
 	}
+	
+	
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 
 	public Integer getStoreFlag() {
 		return storeFlag;