‘linchangsheng’ 1 year ago
parent
commit
240a391f71

+ 3 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/LetterLogic.java

@@ -291,8 +291,9 @@ public class LetterLogic {
     public void reject(List<String> ids) {
     public void reject(List<String> ids) {
 
 
         if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids)
         if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids)
-                .isNotNull(LeLetter::getExamineStatus).ne(LeLetter::getStatus,LetterStatusEnum.WAIT.getKey()).count()>0)
-            throw new RemoteServiceException("存在有待执行的联络函");
+                .in(LeLetter::getStatus,LetterStatusEnum.WAIT.getKey(),LetterStatusEnum.SEND.getKey(),LetterStatusEnum.WAIT_EXAMINE.getKey()).count()>0)
+            throw new RemoteServiceException("存在有非审批的联络函");
+
         leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
         leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
                 .set(LeLetter::getStatus, LetterStatusEnum.SEND.getKey()).update();
                 .set(LeLetter::getStatus, LetterStatusEnum.SEND.getKey()).update();
     }
     }