fix

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

@@ -198,6 +198,11 @@ public class DepartmentContoller extends WebBaseController{
 				if(dto.getIsStore() == 1) {
 					continue;
 				}
+				Integer type = departmentAddQO.getType();
+				Integer isStore = 0;
+				if(type != null && type == 3){
+					isStore = 1;
+				}
 				DepartmentDTO department = new DepartmentDTO();
 				department.setParentDepartmentId(parentId);
 				//department.setWxDepartmentId(dto.getWxDepartmentId());
@@ -205,7 +210,11 @@ public class DepartmentContoller extends WebBaseController{
 				department.setDepartmentName(departmentAddQO.getDepartmentName());
 				department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
 				department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
-				department.setIsStore(departmentAddQO.getStoreFlag());
+				if(departmentAddQO.getStoreFlag() != null){
+					department.setIsStore(departmentAddQO.getStoreFlag());
+				}else{
+					department.setIsStore(isStore);
+				}
 				department.setSort(departmentAddQO.getSort());
 				department.setLevel(dto.getLevel() + 1);
 				department.setRelatedId(departmentAddQO.getRelatedId());
@@ -351,7 +360,11 @@ public class DepartmentContoller extends WebBaseController{
 		if(StringUtils.isNotBlank(sonDepartment)) {
 			List<DepartmentAddQO> list = JSONArray.parseArray(sonDepartment, DepartmentAddQO.class);
 			for (DepartmentAddQO departmentAddQO : list) {
-				
+				Integer type = departmentAddQO.getType();
+				Integer isStore = 0;
+				if(type != null && type == 3){
+					isStore = 1;
+				}
 				String sonParentId = "";
 				DepartmentDTO dto = departmentApiService.selectById(parentId);
 				if(dto == null || dto.getStatusFlag() == 0) {
@@ -373,6 +386,11 @@ public class DepartmentContoller extends WebBaseController{
 					department.setSort(departmentAddQO.getSort());
 					department.setIsStore(departmentAddQO.getStoreFlag());
 					department.setLevel(dto.getLevel() + 1);
+					if(departmentAddQO.getStoreFlag() != null){
+						department.setIsStore(departmentAddQO.getStoreFlag());
+					}else{
+						department.setIsStore(isStore);
+					}
 					department.setRelatedId(departmentAddQO.getRelatedId());
 					HaobanResponse hr = departmentApiService.add(department);
 					if(hr.getErrorCode() != 1) {

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

@@ -21,6 +21,8 @@ public class DepartmentAddQO implements Serializable {
 	private Boolean addFlag;
 	
 	private Integer sort;
+	
+	private Integer type;
 
 	public String getDepartmentName() {
 		return departmentName;
@@ -96,6 +98,14 @@ public class DepartmentAddQO implements Serializable {
 	public void setAddFlag(Boolean addFlag) {
 		this.addFlag = addFlag;
 	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}