优化问题生成

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -325,7 +325,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
 
         removeExistData(data.getId());
-
+        LoginUser user=SecurityUtils.getLoginUser();
         List<CoreSafetyTaskData> points = new ArrayList();
         List<CoreSafetyTaskDataNfc> nfcs = new ArrayList<>();
         List<CoreSafetyTaskDataRemarkimg> remarkimgs = new ArrayList<>();
@@ -348,7 +348,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
 
             if (ObjectUtil.equal(point.getValue(), 1)) {
-                Question question = dataVoToQuestion(data, org, point, pointVo);
+                Question question = dataVoToQuestion(data, org, point, pointVo,user);
                 questions.add(question);
             }
         }
@@ -417,7 +417,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         return img;
     }
 
-    private Question dataVoToQuestion(TaskRegisterVo task, SysOrg org, CoreSafetyTaskData point, AppTaskRegisterPointVo pointVo) {
+    private Question dataVoToQuestion(TaskRegisterVo task, SysOrg org, CoreSafetyTaskData point, AppTaskRegisterPointVo pointVo,LoginUser user) {
         Question question = Question.builder()
                 .srcTaskId(task.getId())
                 .orgId(task.getBeCheckedOrgId())
@@ -430,8 +430,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 .checkItem(pointVo.getItemName())
                 .checkContent(pointVo.getPointName())
                 .questionDesc(point.getRemark())
-                .submitorId(point.getSubmitBy())
-                .submitorName(point.getSubmitName())
+                .submitorId(ObjectUtil.isNull(point.getSubmitBy())?user.getUserid():point.getSubmitBy())
+                .submitorName(ObjectUtil.isNull(point.getSubmitName())?user.getName():point.getSubmitName())
                 .submitTime(point.getSubmitTime())
                 .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                 .build();