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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -90,7 +90,7 @@ public class WebsitSalesLogic {
     public SalesOrderBean detail(HttpServletRequest request, String salesId) {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
         WebsitSales sales = websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
+                .eq(WebsitSales::getIdentity, wechat.getUser().getIdCard())
                 .eq(WebsitSales::getSalesId, salesId)
                 .one();
         if (Objects.isNull(sales)) {

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

@@ -479,6 +479,11 @@ public class OrderBaseLogic {
         }
 
         StringBuilder joinSlaveStr = new StringBuilder();
+        // 清空小工
+        pgOrderWorkerService.lambdaUpdate()
+                .eq(PgOrderWorker::getOrderBaseId, pgOrderBase.getId())
+                .eq(PgOrderWorker::getIsMaster, false)
+                .remove();
         if (CollectionUtil.isNotEmpty(workerList)) {
             joinSlaveStr.append(", 辅助工程师");
             List<PgOrderWorker> orderWorkerList = new ArrayList<>();
@@ -498,11 +503,7 @@ public class OrderBaseLogic {
                 orderWorkerList.add(orderWorker);
                 joinSlaveStr.append("【").append(orderWorker.getWorkerName()).append("】");
             }
-            // 清空小工
-            pgOrderWorkerService.lambdaUpdate()
-                    .eq(PgOrderWorker::getOrderBaseId, pgOrderBase.getId())
-                    .eq(PgOrderWorker::getIsMaster, false)
-                    .remove();
+
             pgOrderWorkerService.saveBatch(orderWorkerList);
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -616,7 +616,6 @@ public class AdminUserLogic {
                 .orderByDesc(AdminUser::getCompanyWechatId)
                 .orderByAsc(AdminUser::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
-        log.info("查询账户管理 {}", page);
 
         if (CollectionUtil.isNotEmpty(page.getRecords())) {
             for (AdminUser record : page.getRecords()) {