Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IDingOrganizationService.java

@@ -64,7 +64,7 @@ public interface IDingOrganizationService extends IService<DingOrganization> {
     Map<String, DingOrganization> getOrgMap(List<String> orgCodeList);
 
     /**
-     * 获取  key：专家code value：组织信息
+     * 获取  key：专家code value：组织信息 (所属单位组织信息)
      * @param employeeInfoList
      * @return
      */

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/DingOrganizationServiceImpl.java

@@ -94,7 +94,7 @@ public class DingOrganizationServiceImpl extends ServiceImpl<DingOrganizationMap
 
         Map<String, DingOrganization> empCodeOrgMap = new HashMap<String, DingOrganization>();
         for(DingEmployeeInfo dingEmployeeInfo:employeeInfoList){
-            DingOrganization dingOrganization = orgMap.get(dingEmployeeInfo.getOrganizationCode());
+            DingOrganization dingOrganization = orgMap.get(dingEmployeeInfo.getEmpPosUnitCode());
             if (Objects.nonNull(dingOrganization)){
                 empCodeOrgMap.put(dingEmployeeInfo.getEmployeeCode(),dingOrganization);
             }