|
|
@@ -682,16 +682,18 @@ public class OrderBaseLogic {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 清除非正常状态的小工师傅
|
|
|
- final List<WebsitUser> websitUserList = websitUserService.lambdaQuery()
|
|
|
- .eq(WebsitUser::getCompanyWechatId, orderBase.getCompanyWechatId())
|
|
|
- .ne(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
|
|
|
- .eq(WebsitUser::getWebsitId, orderBase.getWebsitId())
|
|
|
- .in(WebsitUser::getUserId, workerTeamMap.keySet())
|
|
|
- .list();
|
|
|
+ if (CollectionUtil.isNotEmpty(workerTeamMap)) {
|
|
|
+ // 清除非正常状态的小工师傅
|
|
|
+ final List<WebsitUser> websitUserList = websitUserService.lambdaQuery()
|
|
|
+ .eq(WebsitUser::getCompanyWechatId, orderBase.getCompanyWechatId())
|
|
|
+ .ne(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
|
|
|
+ .eq(WebsitUser::getWebsitId, orderBase.getWebsitId())
|
|
|
+ .in(WebsitUser::getUserId, workerTeamMap.keySet())
|
|
|
+ .list();
|
|
|
|
|
|
- for (WebsitUser websitUser : websitUserList) {
|
|
|
- workerTeamMap.remove(websitUser.getUserId());
|
|
|
+ for (WebsitUser websitUser : websitUserList) {
|
|
|
+ workerTeamMap.remove(websitUser.getUserId());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return new ArrayList<>(workerTeamMap.values());
|