fix

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -37,4 +37,6 @@ public interface DepartmentMapper {
 	TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 	
 	Page<TabHaobanDepartment> pageFullStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("search")String search,@Param("minCount")int minCount);
+
+	TabHaobanDepartment getByRelatedId(@Param("relatedId")String relatedId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/DepartmentService.java

@@ -28,4 +28,6 @@ public interface DepartmentService {
 
 	DepartmentDTO getRootByEnterpriseId(String wxEnterpriseId);
 
+	DepartmentDTO getByRelatedId(String storeId);
+
 }

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

@@ -110,4 +110,10 @@ public class DepartmentServiceImpl implements DepartmentService {
 		return EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab);
 	}
 
+	@Override
+	public DepartmentDTO getByRelatedId(String relatedId) {
+		TabHaobanDepartment tab = mapper.getByRelatedId(relatedId);
+		return EntityUtil.changeEntityByJSON(DepartmentDTO.class, tab);
+	}
+
 }

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

@@ -41,6 +41,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	@Autowired
 	private DepartmentMapper departmentMapper;
 	
+	@Autowired
+	private com.gic.enterprise.api.service.DepartmentService gicDepartmentService;
+	
 	@Override
 	public List<DepartmentDTO> listByParentId(String parentId) {
 		List<TabHaobanDepartment> list = departmentService.listByParentId(parentId);
@@ -184,18 +187,50 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	        return;
 	    }
 		
-		
+		Integer status = 0;
+		String storeName = "";
+		String departmentId = "";
+		String storeId = "";
 		for (SyncJsonColumnDTO syncJsonColumnDTO:fieldList){
 	    	String name = StringUtil.camelName(syncJsonColumnDTO.getName());
 	        String value = syncJsonColumnDTO.getValue();
 	        if("status".equals(name)) {
+	        	status = Integer.parseInt(value);
+	        }
+	        if("storeName".equals(name)) {
+	        	storeName = value;
+	        }
+	        if("departmentId".equals(name)) {
+	        	departmentId = value;
+	        }
+	        if("storeId".equals(name)) {
+	        	storeId = value;
+	        }
+		}
+		DepartmentDTO department = departmentService.getByRelatedId(storeId);
+		if(department == null) {
+			if(status != null && status == 2) {
+				DepartmentDTO parent = getParent(departmentId);
+				if(parent == null) {
 					
 				}
 			}
+		}
+		
 	        
 		
 	}
 
+	private DepartmentDTO getParent(String departmentId) {
+		DepartmentDTO department = departmentService.getByRelatedId(departmentId);
+		if(department == null) {
+			com.gic.enterprise.api.dto.DepartmentDTO dto = gicDepartmentService.getDeptment(departmentId);
+			String parentId = dto.getParentDepartId();
+			getParent(parentId);
+		}
+		return department;
+	}
+
 	@Override
 	public void syncGicDepartment(String fieldListString) {
 		// TODO Auto-generated method stub

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

@@ -214,4 +214,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 		}
 	}
 
+	@Override
+	public void syscGicClerk(String fieldListString) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -298,4 +298,13 @@
     ) t WHERE t.rownum >  #{minCount}
   </select>
   
+  <select id="getByRelatedId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where level = 0
+    and related_id = #{relatedId}
+    and status_flag = 1
+  </select>
+  
 </mapper>
\ No newline at end of file