Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1219,7 +1219,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     put("logPkeyId", logPkeyId);
                     put("nodePrimaryKeyId", nodePrimaryKeyId);
                     put("contractId", contractId);
-                }}, null, contractId);
+                }}, null, contractId, request);
             } catch (Exception e) {
                 e.printStackTrace();
                 throw new ServiceException("重新保存PDF信息失败，原因：" + e.getMessage());
@@ -1323,7 +1323,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     String taskIds = StringUtils.join(taskList, ",");
                     removeUserAndName(taskIds, userId, userName);
                 }*/
-                recordResignLog("re-sign(试验)", StringUtils.join(dataIdList, ","), list, dto, dto.getProjectId(), null);
+                recordResignLog("re-sign(试验)", StringUtils.join(dataIdList, ","), list, dto, dto.getProjectId(), null, request);
             } catch (Exception e) {
                 e.printStackTrace();
                 throw new ServiceException("重新保存PDF信息失败，原因：" + e.getMessage());
@@ -1430,7 +1430,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                                 .eq(TaskParallel::getProcessInstanceId, taskList.get(i).getProcessInstanceId()));
                     }
                 }
-                this.recordResignLog("re-sign(委托单)",  entrustIds, entrustInfos, dtos,taskList.get(0).getProjectId() , taskList.get(0).getContractId());
+                this.recordResignLog("re-sign(委托单)",  entrustIds, entrustInfos, dtos,taskList.get(0).getProjectId() , taskList.get(0).getContractId(), request);
             } catch (Exception e) {
                 e.printStackTrace();
                 throw new ServiceException("重新保存PDF信息失败，原因：" + e.getMessage());
@@ -1971,7 +1971,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     .ne(InformationQuery::getSaveAgain, 1)
                     .in(InformationQuery::getId, newIds));
             List<InformationQuery> list = informationQueryService.list(new LambdaQueryWrapper<>(InformationQuery.class).in(InformationQuery::getId, newIds));
-            recordResignLog("save-again", StringUtils.join(newIds, ","), list, dtos, dtos.get(0).getProjectId()+"", dtos.get(0).getContractId()+"");
+            recordResignLog("save-again", StringUtils.join(newIds, ","), list, dtos, dtos.get(0).getProjectId()+"", dtos.get(0).getContractId()+"", null);
             taskProgressService.addTaskProgress(dtos.get(0).getProjectId(), dtos.get(0).getContractId(), 1,dtos.size(),null);
         }
         return R.success("操作成功");
@@ -2237,7 +2237,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     put("projectId", projectId);
                     put("classify", classify);
                     put("type", type);
-                }}, projectId, contractId);
+                }}, projectId, contractId, request);
             } catch (Exception e) {
                 e.printStackTrace();
                 throw new ServiceException("重新保存PDF信息失败，原因：" + e.getMessage());
@@ -2370,14 +2370,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             Map<String, String> requestMap = new HashMap<>();
             requestMap.put("ids", ids);
             requestMap.put("userIds", userIds);
-            recordResignLog("一键重签", ids, queryList, requestMap, null, null);
+            recordResignLog("一键重签", ids, queryList, requestMap, null, null, null);
         }
         taskProgressService.addTaskProgress(queryList.get(0).getProjectId(), queryList.get(0).getContractId(), 4,queryList.size(),ids);
         return R.success("操作成功");
     }
 
 
-    public void recordResignLog(String module, String businessIds, Object data, Object requestData, String projectId, String contractId){
+    public void recordResignLog(String module, String businessIds, Object data, Object requestData, String projectId, String contractId, HttpServletRequest request){
         try {
             OperationLog resignLog = new OperationLog();
             resignLog.setProjectId(StringUtil.isNumeric(projectId) ? Long.parseLong(projectId) : null);
@@ -2389,8 +2389,18 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             resignLog.setOperationTime(DateUtil.formatTime(DateUtil.now()));
             resignLog.setOperationView("");
             resignLog.setBusinessId(businessIds);
-            resignLog.setCreateUser(AuthUtil.getUserId());
-            resignLog.setOperationAccount(AuthUtil.getNickName());
+            if (request != null) {
+                BladeUser user = AuthUtil.getUser(request);
+                if (user != null) {
+                    resignLog.setCreateUser(user.getUserId());
+                    resignLog.setOperationAccount(user.getUserName());
+                    resignLog.setCreateUserName(user.getNickName());
+                }
+            } else {
+                resignLog.setCreateUser(AuthUtil.getUserId());
+                resignLog.setOperationAccount(AuthUtil.getUserName());
+                resignLog.setCreateUserName(AuthUtil.getNickName());
+            }
             operationLogService.save(resignLog);
         } catch (Exception e) {
             e.printStackTrace();