Просмотр исходного кода

fix(annual-adjustment): 修复年度调整功能中的数据保存和查询问题

- 在年度调整服务中添加请求上下文导入并设置创建者ID
- 修复薪资等级数据获取方法返回空值避免数据异常
- 在年度锁定操作插件查询中添加部门字段确保数据完整性
wyc 1 неделя назад
Родитель
Сommit
1d07b272ff

+ 2 - 0
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/AnnualAdjustmentService.java

@@ -1,6 +1,7 @@
 package nckd.jxccl.hr.psms.business;
 
 import kd.bos.common.enums.EnableEnum;
+import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.constant.StatusEnum;
 import kd.bos.logging.Log;
@@ -982,6 +983,7 @@ public class AnnualAdjustmentService {
         newPersonPosFile.set(PositionStructureConstant.NCKD_LYRCONTRIBSCORE, ac.lastYearContributeScore);
         newPersonPosFile.set(PositionStructureConstant.NCKD_ALLYEARSCORESUM, ac.data.getAllYearScoreSum());
         newPersonPosFile.set(PositionStructureConstant.NCKD_ADDYCONTRIBSCORE, ac.addYearContributeScore);
+        newPersonPosFile.set(PositionStructureConstant.CREATOR_KEY, RequestContext.get().getCurrUserId());
         // 备注
         newPersonPosFile.set(PositionStructureConstant.KEY_NCKD_CAUSEREMARK, ac.remark);
         if(AdjustTypeEnum.KEEP_LEVEL.getCode().equals(ac.adjustType)){

+ 1 - 1
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/common/PosSalaryGrade1.java

@@ -138,6 +138,6 @@ public class PosSalaryGrade1 implements ICustomFetchDataService {
 
     @Override
     public Map<String, Object> fetchDataCalTask(Long calTaskId, Map<String, Object> paramsMap, Map<String, Object> extParamMap) {
-        return ICustomFetchDataService.super.fetchDataCalTask(calTaskId, paramsMap, extParamMap);
+        return null;
     }
 }

+ 1 - 0
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/annualadjust/AnnualLockOrUnLockedOpPlugin.java

@@ -117,6 +117,7 @@ public class AnnualLockOrUnLockedOpPlugin extends AbstractOperationServicePlugIn
 
         QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
                 .add(FormConstant.ID_KEY)
+                .add(PositionStructureConstant.NCKD_DEP)
                 .add(PositionStructureConstant.NCKD_LOCKSTATUS)
                 .add(PositionStructureConstant.KEY_NCKD_LOCKUSER)
                 .add(PositionStructureConstant.NCKD_LOCKDATETIME);