Merge branch 'dev_20260131' into dev_20260131_youshen430

sckw-modules/sckw-order/src/main/java/com/sckw/order/config/FeignConfig.java

@@ -22,11 +22,13 @@ public class FeignConfig {
     public RequestInterceptor requestInterceptor() {
         return requestTemplate -> {
             ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-            HttpServletRequest request = attributes.getRequest();
-            String userInfoStrEncode = request.getHeader(Global.USER_INFO_STR_ENCODE);
-            String entInfoStrEncode = request.getHeader(Global.ENT_INFO_STR_ENCODE);
-            requestTemplate.header(Global.USER_INFO_STR_ENCODE, userInfoStrEncode);
-            requestTemplate.header(Global.ENT_INFO_STR_ENCODE, entInfoStrEncode);
+            if (attributes != null) {
+                HttpServletRequest request = attributes.getRequest();
+                String userInfoStrEncode = request.getHeader(Global.USER_INFO_STR_ENCODE);
+                String entInfoStrEncode = request.getHeader(Global.ENT_INFO_STR_ENCODE);
+                requestTemplate.header(Global.USER_INFO_STR_ENCODE, userInfoStrEncode);
+                requestTemplate.header(Global.ENT_INFO_STR_ENCODE, entInfoStrEncode);
+            }
         };
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -462,10 +462,11 @@ public class KwsUserService {
             } else {
                 params.put("entId", LoginUserHolder.getEntId());
             }
-        } else {
-            //params.put("systemType", SystemTypeEnum.MANAGE.getCode());
-            params.put("entList", LoginUserHolder.getChildEntList());
         }
+//        else {
+//            //params.put("systemType", SystemTypeEnum.MANAGE.getCode());
+//            params.put("entList", LoginUserHolder.getChildEntList());
+//        }
 
         return kwsUserDao.findPage(params);
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/CancelHandler.java

@@ -131,6 +131,10 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
         if (gatekeeperWaybillOrder == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.GATEKEEPER_ORDER_NOT_FOUND, "门卫订单不存在！");
         }
+        if (!GatekeeperStatusEnum.PENDING_ENTRY.getCode().equals(gatekeeperWaybillOrder.getStatus())) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.GATEKEEPER_ORDER_STATUS_ERROR, "门卫状态异常，不能取消订单！");
+        }
+
         gatekeeperWaybillOrder.setStatus(GatekeeperStatusEnum.CANCEL.getCode());
         gatekeeperWaybillOrderRepository.updateById(gatekeeperWaybillOrder);
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtGatekeeperWaybillOrder.java

@@ -64,7 +64,7 @@ public class KwtGatekeeperWaybillOrder implements Serializable {
     private Integer type;
 
     /**
-     * 状态（1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）
+     * 状态（1-待进场，5-已进场、10-待放行、15-已放行、20-已离场、25-空载离场、99-已取消）
      */
     private Integer status;