Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -216,7 +216,7 @@ public class DepartmentContoller extends WebBaseController{
 				DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
 				String departmentId = departmentAdd.getDepartmentId();
 				
-				String sonDepartment = departmentAddQO.getSonDepartment();
+				String sonDepartment = departmentAddQO.getChildren();
 				handler(sonDepartment,departmentId);
 			}
 		}
@@ -362,14 +362,14 @@ public class DepartmentContoller extends WebBaseController{
 				String departmentId = departmentAddQO.getDepartmentId();
 				Boolean addFlag = departmentAddQO.getAddFlag();
 				//在部门下新增部门
-				if(addFlag) {
+				if(addFlag == null || addFlag) {
 					DepartmentDTO department = new DepartmentDTO();
 					department.setParentDepartmentId(parentId);
 					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.setSort(departmentAddQO.getSort());
 					department.setIsStore(departmentAddQO.getStoreFlag());
 					department.setLevel(dto.getLevel() + 1);
 					department.setRelatedId(departmentAddQO.getRelatedId());
@@ -398,7 +398,7 @@ public class DepartmentContoller extends WebBaseController{
 					sonParentId = departmentEdit.getDepartmentId();
 				}
 				
-				sonDepartment = departmentAddQO.getSonDepartment();
+				sonDepartment = departmentAddQO.getChildren();
 				handler(sonDepartment,sonParentId);
 				
 			}

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

@@ -12,7 +12,7 @@ public class DepartmentAddQO implements Serializable {
 	
 	private String parentDepartmentId;
 	
-	private String sonDepartment;
+	private String children;
 	
 	private Integer storeFlag;
 	
@@ -38,12 +38,13 @@ public class DepartmentAddQO implements Serializable {
 		this.parentId = parentId;
 	}
 
-	public String getSonDepartment() {
-		return sonDepartment;
+
+	public String getChildren() {
+		return children;
 	}
 
-	public void setSonDepartment(String sonDepartment) {
-		this.sonDepartment = sonDepartment;
+	public void setChildren(String children) {
+		this.children = children;
 	}
 
 	public String getDepartmentId() {