‘linchangsheng’ 7 月之前
父節點
當前提交
06b6bf7e62

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

@@ -267,7 +267,7 @@ public class LetterLogic {
         zfireParam = FieldUtils.supplyParam(zfireParam, LeLetterVO.class, adminUser);
 
         IPage<LeLetterVO> leLetterVOIPage = letterMapper.listLetter(page, zfireParam, adminCompanyIds,
-                adminUser.getType().equals(0) && adminUser.getAdminRole().getType().equals(1) && adminUser.getAdminRole().getLevel().equals(0)?true:false);
+                adminUser.getType().equals(0) && (adminUser.getAdminRole().getType().equals(1) && adminUser.getAdminRole().getLevel().equals(0))?true:false);
         return leLetterVOIPage;
 
     }

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

@@ -385,12 +385,19 @@ public class UserLogic {
                 userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy-MM-dd"));
                 userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy-MM-dd"));
             }
+            
+
 
 
 
             userWaits.add(userWait);
         }
         userWaitService.saveBatch(userWaits);
+
+        List<String> stringList = userWaits.stream().map(UserWait::getMobile).collect(Collectors.toList());
+
+        if (userWaitService.lambdaQuery().in(UserWait::getMobile,stringList).count() > stringList.stream().count())
+            throw new RemoteServiceException("拥有多个师傅编号");
     }