需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -92,7 +92,11 @@ public class WorkerLogic {
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .count() < 1 &&
                     policyOrderService.lambdaQuery().eq(PolicyOrder::getWebsitUserId,websitUser.getId())
-                    .eq(PolicyOrder::getType,"AC").eq(PolicyOrder::getIsReceipt,IsYesNoEnum.NO.getKey()).count() < 1) {
+                    .eq(PolicyOrder::getType,"AC").eq(PolicyOrder::getIsReceipt,IsYesNoEnum.NO.getKey()).count() < 1
+
+                    && workerPolicyService.lambdaQuery()
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId()).eq(WorkerPolicy::getPolicyType,"AC").count()< 1
+            ) {
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -247,7 +247,7 @@ public class UserLogic {
             String  in_policy_order= (String) row.get(24);
             String in_policy_start_time = (String) row.get(25);
             String in_policy_end_time = (String) row.get(26);
-            if (StringUtils.isAnyBlank(name, mobile, websitNumber,workerNumber,idcard,idcardStartTime,idcardEndTime)) {
+            if (StringUtils.isAnyBlank(name, mobile, websitNumber,idcard,idcardStartTime,idcardEndTime)) {
                 throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
             }
             if (mobile.length() != 11) {