Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -698,7 +698,7 @@ public class OrderBaseLogic {
             CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
             workerId = currentCompanyWechat.getUser().getUserId();
         }
-        Map<String, WorkerTeamBean> workerTeamMap = new HashMap<>();
+        Map<String, WorkerTeamBean> workerTeamMap = new TreeMap<>();
         if (StringUtils.isNotBlank(orderBase.getWorkerId())) {
             final List<PgOrderWorker> orderWorkerList = pgOrderWorkerService.lambdaQuery()
                     .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
@@ -715,7 +715,7 @@ public class OrderBaseLogic {
                     bean.setWorkerMobile(orderWorker.getWorkerMobile());
                     bean.setWorkerIdCard(orderWorker.getWorkerIdcard());
                     bean.setIsSelect(true);
-                    workerTeamMap.put(orderWorker.getWorkerIdcard(), bean);
+                    workerTeamMap.put(orderWorker.getWorkerId(), bean);
                 }
             }
         }
@@ -769,11 +769,12 @@ public class OrderBaseLogic {
                         // workerTeamMap数量为0时, 默认选中
                         bean.setIsSelect(true);
                     }
-                    workerTeamMap.put(bean.getWorkerIdCard(), bean);
+                    workerTeamMap.put(bean.getWorkerId(), bean);
                 }
             }
         }
 
+
         return new ArrayList<>(workerTeamMap.values());
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.SyncOrderDto;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.workorder.*;
 import com.gree.mall.manager.commonmapper.workorder.IncreMapper;
@@ -165,6 +164,7 @@ public class ChangeOrderLogic {
                 pgOrderWorker.setWebsitName(adminWebsit.getName());
                 pgOrderWorker.setWorkerName(user.getNickName());
                 pgOrderWorker.setWorkerId(workerId);
+                pgOrderWorker.setWorkerNumber(user.getWorkerNumber());
                 pgOrderWorker.setWorkerIdcard(user.getIdCard());
                 pgOrderWorker.setWorkerMobile(user.getMobile());
                 if (userOne.getIdCard().equals(user.getIdCard()))