Browse Source

no message

FengChaoYu 6 months ago
parent
commit
37a2d70f85

+ 16 - 15
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -569,23 +569,24 @@ public class OrderBaseLogic {
         if (StringUtils.equals(orderBase.getOrderStatus(), OrderBaseStatusEnum.YWG.getKey())) {
             throw new RemoteServiceException("工单状态”已完工“");
         }
-        final List<PgOrderWorker> orderWorkerList = pgOrderWorkerService.lambdaQuery()
-                .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
-                .eq(PgOrderWorker::getIsMaster, false)
-                .ne(PgOrderWorker::getWorkerId, orderBase.getWorkerId())
-                .list();
-
+        Map<String, WorkerTeamBean> workerTeamMap = new HashMap<>();
+        if (StringUtils.isNotBlank(orderBase.getWorkerId())) {
+            final List<PgOrderWorker> orderWorkerList = pgOrderWorkerService.lambdaQuery()
+                    .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
+                    .eq(PgOrderWorker::getIsMaster, false)
+                    .ne(PgOrderWorker::getWorkerId, orderBase.getWorkerId())
+                    .list();
 
 
-        Map<String, WorkerTeamBean> workerTeamMap = new HashMap<>();
-        if (CollectionUtil.isNotEmpty(orderWorkerList)) {
-            for (PgOrderWorker orderWorker : orderWorkerList) {
-                WorkerTeamBean bean = new WorkerTeamBean();
-                bean.setWorkerId(orderWorker.getWorkerId());
-                bean.setWorkerName(orderWorker.getWorkerName());
-                bean.setWorkerNumber(orderWorker.getWorkerNumber());
-                bean.setIsSelect(true);
-                workerTeamMap.put(orderWorker.getWorkerId(), bean);
+            if (CollectionUtil.isNotEmpty(orderWorkerList)) {
+                for (PgOrderWorker orderWorker : orderWorkerList) {
+                    WorkerTeamBean bean = new WorkerTeamBean();
+                    bean.setWorkerId(orderWorker.getWorkerId());
+                    bean.setWorkerName(orderWorker.getWorkerName());
+                    bean.setWorkerNumber(orderWorker.getWorkerNumber());
+                    bean.setIsSelect(true);
+                    workerTeamMap.put(orderWorker.getWorkerId(), bean);
+                }
             }
         }