修改

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -206,9 +206,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     throw new MarkerMetException(500, "只有未结算的结净数据才能进行撤销发布操作");
                 }
             }
-            UserPayload userPayload = UserPayload.getCurrUser();
-            String userName = userPayload.getUserName();
-            String userId = userPayload.getUserCode();
+//            UserPayload userPayload = UserPayload.getCurrUser();
+            String userName = null;
+            String userId = null;
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userName = userPayload.getUserName();
+                userId = userPayload.getUserCode();
+            }catch (Exception e) {
+                userName = models.get(0).getUpdateManName();
+                userId = models.get(0).getUpdateManNo();
+            }
             int count = 0;
             for (MeterWorkRailwayActual model: models){
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
@@ -410,9 +418,19 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     throw new MarkerMetException(500, "只有已匹配委托且未发布的数据才能进行数据发布操作");
                 }
             }
-            UserPayload userPayload = UserPayload.getCurrUser();
-            String userName = userPayload.getUserName();
-            String userId = userPayload.getUserCode();
+//            UserPayload userPayload = UserPayload.getCurrUser();
+//            String userName = userPayload.getUserName();
+//            String userId = userPayload.getUserCode();
+            String userName = null;
+            String userId = null;
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userName = userPayload.getUserName();
+                userId = userPayload.getUserCode();
+            }catch (Exception e) {
+                userName = models.get(0).getUpdateManName();
+                userId = models.get(0).getUpdateManNo();
+            }
             int count = 0;
             for (MeterWorkRailwayActual model: models){
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());