Merge branch 'refs/heads/master' into feat-hr-psms_1.0

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hstu/business/CreateEvalQuestService.java

@@ -18,7 +18,6 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.bos.servicehelper.user.UserServiceHelper;
-import kd.hr.hbp.business.openservicehelper.hrpi.HRPIDepempServiceHelper;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.enums.PerfPlanRoleEnum;
 import nckd.jxccl.base.common.exception.ValidationException;
@@ -272,7 +271,9 @@ public class CreateEvalQuestService {
             return new DynamicObjectCollection();
         }
 
-        Map<String, Object> depEmp = HRPIDepempServiceHelper.getDepemp(personId);
+        // Map<String, Object> depEmp = HRPIDepempServiceHelper.getDepemp(personId);
+        // TODO 【待修改】新架构没有HRPIDepempServiceHelper类
+        Map<String, Object> depEmp = null;
         if (depEmp == null) {
             logger.warn("【优秀生考评】-获取人员信息失败，人员ID：{}", personId);
             return new DynamicObjectCollection();
@@ -541,7 +542,9 @@ public class CreateEvalQuestService {
         List<Long> personIds = new ArrayList<>(persons.size());
         persons.forEach(person -> personIds.add(person.getLong(HonorStudentConstant.ID_KEY)));
         //获取任职经历
-        List<Map<String, Object>> empOrgRelList = HRPIDepempServiceHelper.listEmpOrgrels(personIds);
+        // List<Map<String, Object>> empOrgRelList = HRPIDepempServiceHelper.listEmpOrgrels(personIds);
+        //TODO 【待修改】新架构没有HRPIDepempServiceHelper类
+        List<Map<String, Object>> empOrgRelList = null;
         //根据ID分组，获取所属公司和职位
         Map<Long, Map<String, DynamicObject>> empOrgRelMap = empOrgRelList.stream()
                 .filter(item -> item.get(FormConstant.DEP_EMP) != null)