‘linchangsheng’ 2 tháng trước cách đây
mục cha
commit
506af8e257

+ 1 - 5
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -144,11 +144,7 @@ public class WorkerManagerLogic {
                 .and(item -> item.eq(!StringUtil.isEmpty(websitUserBean.getWorkerNumber()),PgOrderBase::getWorkerNumber,websitUserBean.getWorkerNumber())
                         .or(!StringUtil.isEmpty(websitUserBean.getWorkerNumber())).like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
                 .eq(PgOrderBase::getWebsitId,websitUserBean.getWebsitId())
-                .notIn(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.YJS.getKey(),
-                        OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.YWGO.getKey(),
-                        OrderBaseStatusEnum.YGBGD.getKey(),OrderBaseStatusEnum.FGFZF.getKey(),OrderBaseStatusEnum.YZFGD.getKey(),
-                        OrderBaseStatusEnum.FZXBWG.getKey(),OrderBaseStatusEnum.FBBWG.getKey(),OrderBaseStatusEnum.LSXX.getKey(),
-                        OrderBaseStatusEnum.PLGB.getKey(),OrderBaseStatusEnum.ZCGB.getKey()
+                .notIn(PgOrderBase::getOrderStatus, "YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL"
                         ).count() > 0) {
 
             throw new RemoteServiceException("师傅存在未完工工单,请改派后再离职");