|
|
@@ -2,9 +2,7 @@ package com.gree.mall.miniapp.logic.workorder;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
-import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.db.sql.Order;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
|
|
|
@@ -14,7 +12,10 @@ import com.gree.mall.miniapp.bean.order.WorkerTeamBean;
|
|
|
import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
|
|
|
import com.gree.mall.miniapp.bean.workorder.*;
|
|
|
import com.gree.mall.miniapp.commonmapper.workorder.OrderBaseCMapper;
|
|
|
-import com.gree.mall.miniapp.enums.*;
|
|
|
+import com.gree.mall.miniapp.enums.ExamineWorkerStatusEnum;
|
|
|
+import com.gree.mall.miniapp.enums.StateEnum;
|
|
|
+import com.gree.mall.miniapp.enums.UserTypeEnum;
|
|
|
+import com.gree.mall.miniapp.enums.WebsitAttrEnum;
|
|
|
import com.gree.mall.miniapp.enums.workorder.AppraiseStatusEnum;
|
|
|
import com.gree.mall.miniapp.enums.workorder.OrderBaseStatusEnum;
|
|
|
import com.gree.mall.miniapp.enums.workorder.OrderFlagEnum;
|
|
|
@@ -794,7 +795,7 @@ public class OrderBaseLogic {
|
|
|
|
|
|
for (WebsitUser websitUser : websitUserList) {
|
|
|
final User user = userMap.get(websitUser.getUserId());
|
|
|
- if (Objects.nonNull(user)) {
|
|
|
+ if (Objects.nonNull(user) && !workerTeamMap.containsKey(user.getUserId())) {
|
|
|
WorkerTeamBean bean = new WorkerTeamBean();
|
|
|
bean.setWorkerId(user.getUserId());
|
|
|
bean.setWorkerName(user.getNickName());
|
