no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -634,7 +634,7 @@ public class WorkerLogic {
         Integer count = workerSignConfirmService.lambdaQuery()
                 .eq(WorkerSignConfirm::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(WorkerSignConfirm::getBelongCompanyCode, code)
-                .eq(WorkerSignConfirm::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerSignConfirm::getUserId, currentCompanyWechat.getUser().getUserId())
                 .count();
         if (count > 0) {
             throw new RemoteServiceException("已签" + companyName + "的确认书");
@@ -643,7 +643,7 @@ public class WorkerLogic {
         count = workerSignConfirmManualService.lambdaQuery()
                 .eq(WorkerSignConfirmManual::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(WorkerSignConfirmManual::getBelongCompanyCode, code)
-                .eq(WorkerSignConfirmManual::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerSignConfirmManual::getUserId, currentCompanyWechat.getUser().getUserId())
                 .eq(WorkerSignConfirmManual::getStatus, ExamineStatusEnum.WAIT.getKey())
                 .count();
         if (count > 0) {
@@ -686,7 +686,7 @@ public class WorkerLogic {
         String name = ocrUtil.handwritingORC(signFile2);
         log.info("OCR识别名称:" + name + ", 师傅名称:" + user.getNickName());
 
-        final String key = Constant.RedisPrefix.WORKER_SIGN_CONFIRM + user.getWorkerNumber();
+        final String key = Constant.RedisPrefix.WORKER_SIGN_CONFIRM + user.getUserId();
         if (!StrUtil.equals(name, user.getNickName().replace(" ", ""))) {
             final long signFailCount = redisUtil.incr(key, 1);
             redisUtil.expire(key, 24 * 60 * 60);

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerElecConfirmLogic.java

@@ -113,7 +113,7 @@ public class WorkerElecConfirmLogic {
         final Integer count = workerSignConfirmService.lambdaQuery()
                 .eq(WorkerSignConfirm::getCompanyWechatId, manual.getCompanyWechatId())
                 .eq(WorkerSignConfirm::getBelongCompanyCode, manual.getBelongCompanyCode())
-                .eq(WorkerSignConfirm::getWorkerNumber, manual.getWorkerNumber())
+                .eq(WorkerSignConfirm::getUserId, manual.getUserId())
                 .count();
 
         if (count > 0) {
@@ -137,7 +137,7 @@ public class WorkerElecConfirmLogic {
                     .insert();
         }
 
-        redisUtil.del(Constant.RedisPrefix.WORKER_SIGN_CONFIRM + manual.getWorkerNumber());
+        redisUtil.del(Constant.RedisPrefix.WORKER_SIGN_CONFIRM + manual.getUserId());
     }
 
     public Integer manualCount() {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1670,13 +1670,13 @@
                     websit_user a
                     LEFT JOIN admin_websit b ON a.websit_id = b.websit_id
                     LEFT JOIN `user` c ON a.user_id = c.user_id
-                    LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.worker_number = d.worker_number
+                    LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.user_id = d.user_id
                     WHERE
                     a.examine_status IN ('OK', 'EXPIRED')
                     AND b.attr = 'SELF'
                     GROUP BY
                     b.belong_company_code,
-                    a.worker_number
+                    a.user_id
             ) a
         ${ex.query}
         <if test="ex.orderBy == null or ex.orderBy ==''">
@@ -1692,13 +1692,13 @@
                 websit_user a
                     LEFT JOIN admin_websit b ON a.websit_id = b.websit_id
                     LEFT JOIN `user` c ON a.user_id = c.user_id
-                    LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.worker_number = d.worker_number
+                    LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.user_id = d.user_id
             WHERE
                 a.examine_status IN ('OK', 'EXPIRED')
               AND b.attr = 'SELF'
             GROUP BY
                 b.belong_company_code,
-                a.worker_number
+                a.user_id
         )a WHERE a.status = 1
     </select>
     <select id="workerSignConfirmManualPage"