ly 1 سال پیش
والد
کامیت
dc4984c2ae

+ 3 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -104,6 +104,7 @@ public class OnceWorkOrderProductionController extends BaseController {
         for (BizWorkOrder l : list) {
             l.setProjectType((l.getNoContract() == 1 ? l.getRemark() : "") + l.getTaskTypeName() + (l.getTaskTypeDetailName() != null ? "-" + l.getTaskTypeDetailName() : ""));
             l.setOrderType(l.getType() == 1 ? "循环工单" : "代办工单");
+
             List<BizWorkOrderRecord> records = workOrderRecordService.query()
                     .eq("work_order_id", l.getId()).eq("from_id", 0).list();
             if (records.size() > 0) {
@@ -113,7 +114,8 @@ public class OnceWorkOrderProductionController extends BaseController {
 //                    SysUser sysUser = sysUserMapper.selectUserById(records.get(0).getRecorderId());
                     SysUser sysUser = sysUserMapper.selectUserById(l.getServiceId());
                     l.setServiceName(sysUser == null ? "" : sysUser.getNickName());
-                    l.setRecorderName(sysUser == null ? "" : sysUser.getNickName());
+//                    l.setRecorderName(sysUser == null ? "" : sysUser.getNickName());
+                    l.setRecorderName(l.getRecord().getRecorderName() == null ? "" : l.getRecord().getRecorderName());
                 }
                 if (records.get(0).getHandlerId()!= null){
                     SysUser sysUser2 = sysUserMapper.selectUserById(records.get(0).getHandlerId());

+ 3 - 0
src/main/resources/application.yml

@@ -19,6 +19,8 @@ server:
   # 服务器的HTTP端口,默认为8080
   port: 8043
   servlet:
+    session:
+      timeout: 120000s
     # 应用的访问路径
     context-path: /
   tomcat:
@@ -33,6 +35,7 @@ server:
       min-spare: 100
   timeout: 300000
 
+
 # 日志配置
 logging:
   level: