Merge branch 'master-6-3' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -423,6 +423,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		String storeName = "";
 		String departmentId = "";
 		String storeId = "";
+		String storeParentId="";
 		for (SyncJsonColumnDTO syncJsonColumnDTO:fieldList){
 	    	String name = StringUtil.camelName(syncJsonColumnDTO.getName());
 	        String value = syncJsonColumnDTO.getValue();
@@ -435,19 +436,17 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	        if("departmentId".equals(name)) {
 	        	departmentId = value;
 	        }
-	        if("storeId".equals(name)) {
-	        	storeId = value;
+	        if("storeGroupId".equals(name)) {
+				storeParentId = value;
 	        }
 		}
 		DepartmentDTO department = departmentService.getByRelatedId(storeId);
-		if(department == null) {
-			if(status != null && status == 2) {
-				DepartmentDTO parent = getParent(departmentId);
-				if(parent == null) {
-					TabHaobanWxEnterpriseRelated tab = null;
-					//parent = getRootByEnterpriseId(wxEnterpriseId)；
-				}
-			}
+		DepartmentDTO parent = departmentService.getByRelatedId(storeParentId);
+		if (department!=null && parent!=null&&(!department.getParentDepartmentId().equals(parent.getDepartmentId()))) {
+			logger.info("更新部门！");
+			department.setDepartmentName(storeName);
+			department.setParentDepartmentId(parent.getDepartmentId());
+			this.edit(department);
 		}