履职任务登记人 按实际操作人处理

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -134,7 +134,7 @@ public class ResumptionServiceImpl implements ResumptionService {
         AppPlan appPlan = appPlanMapper.getById(sysResumption.getPlanId());
         sysResumption.setUpdateBy(SecurityUtils.getActualSubmitUserName());
         sysResumption.setSubmitorId(SecurityUtils.getActualSubmitUserId());
-        sysResumption.setSubmitorName(SecurityUtils.getLoginUser().getName());
+        sysResumption.setSubmitorName(SecurityUtils.getActualSubmitUserName());
         sysResumption.setUpdateTime(new Date());
         sysResumption.setSubmitTime(new Date());
         sysResumption.setStatus(2);
@@ -176,8 +176,8 @@ public class ResumptionServiceImpl implements ResumptionService {
                 data.setSubmitTime(new Date());
                 data.setResTime(new Date());
                 data.setPlanId(sysResumption.getPlanId());
-                data.setSubmitBy(SecurityUtils.getLoginUser().getUserid());
-                data.setSubmitName(SecurityUtils.getUsername());
+                data.setSubmitBy(SecurityUtils.getActualSubmitUserId());
+                data.setSubmitName(SecurityUtils.getActualSubmitUserName());
                 data.setRequired(point.getRequired());
                 data.setPointScan(point.getPointScan());
                 if (taskDetailVo.getSubType() == 2) {
@@ -206,8 +206,8 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .checkItem(check.getItemName())
                             .checkContent(point.getPointName())
                             .questionDesc(data.getResRemark())
-                            .submitorId(ObjectUtil.isNull(data.getSubmitBy()) ? SecurityUtils.getLoginUser().getUserid() : data.getSubmitBy())
-                            .submitorName(ObjectUtil.isNull(data.getSubmitName()) ? SecurityUtils.getLoginUser().getName() : data.getSubmitName())
+                            .submitorId(ObjectUtil.isNull(data.getSubmitBy()) ? SecurityUtils.getActualSubmitUserId() : data.getSubmitBy())
+                            .submitorName(ObjectUtil.isNull(data.getSubmitName()) ? SecurityUtils.getActualSubmitUserName() : data.getSubmitName())
                             .submitTime(ObjectUtil.isNull(data.getSubmitTime()) ? new Date() : data.getSubmitTime())
                             .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                             .build();
@@ -257,7 +257,7 @@ public class ResumptionServiceImpl implements ResumptionService {
             dataNfc.setScanMethod(nfc.getScanMethod());
             dataNfc.setStatus(nfc.getStatus());
             dataNfc.setSubmitTime(ObjectUtil.isNull(nfc.getSubmitTime()) ? new Date() : nfc.getSubmitTime());
-            dataNfc.setSubmitBy(nfc.getSubmitBy());
+            dataNfc.setSubmitBy(ObjectUtil.isNull(nfc.getSubmitBy()) ? SecurityUtils.getActualSubmitUserId() : nfc.getSubmitBy());
             long id = IdWorker.getId(dataNfc);
             dataNfc.setId(id);
             dataNfcs.add(dataNfc);