From 038af166cc41438d76690779d99577f3c8228115 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 16 Jun 2025 09:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=85=A5=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bmw/team/controller/NoSignalTeamAttendController.java | 2 ++
 .../resources/mapper/team/NoSignalTeamAttendMapper.xml    | 2 +-
 .../work/team/noSignalTeam/noSignalTeamConfiguration.js   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java
index c1a0dd3..45603af 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java
@@ -159,6 +159,8 @@ public class NoSignalTeamAttendController {
      * 班组已经删除，不打卡
      * 人员暂退，不打卡
      * 分包合同解除班组，不打卡
+     *
+     * 电子合同， 电子签名 不校验
      */
     @Scheduled(cron = "0 0 8,18 * * ?") //每天上午8点，下午6点
     @SchedulerLock(name = "NoSignalTeamAttendTask", lockAtMostFor = SCHEDULER_LOCK_MAX, lockAtLeastFor = SCHEDULER_LOCK_MIN)
diff --git a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamAttendMapper.xml b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamAttendMapper.xml
index 32cbeb6..78223c2 100644
--- a/modules/bmw/src/main/resources/mapper/team/NoSignalTeamAttendMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/team/NoSignalTeamAttendMapper.xml
@@ -143,7 +143,7 @@
 		LEFT JOIN bm_no_signal_team_person bnstp ON bnstp.id_number = bw.id_number AND bnstp.IS_ACTIVE = '1'
 		LEFT JOIN bm_worker_photo bwp1 ON bwp1.ID_NUMBER = bw.id_number AND bwp1.IS_ACTIVE = '1'
 		LEFT JOIN bm_worker_contract bwc ON bwc.idCard = bw.id_number AND bwc.is_active = '1' AND CURRENT_DATE() BETWEEN contractValidDate AND contractInvalidDate
-		WHERE bnst.is_active = '1' AND bnst.id = #{params.id}
+		WHERE bnst.is_active = '1' AND bw.id_number is not null AND bnst.id = #{params.id}
 		<if test="params.keyWord != null and params.keyWord != '' ">
 			and (
 				bw.`name` like concat('%', #{params.keyWord}, '%')
diff --git a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamConfiguration.js b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamConfiguration.js
index 4d11181..c2b8431 100644
--- a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamConfiguration.js
+++ b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamConfiguration.js
@@ -430,23 +430,23 @@ function personStauts(photoType,contractId,realityTeamId){
             html += '<div style="color: #E02232">未上传人脸照片</div>'
             flag = false;
         }
-        if(photoType.indexOf('5') != -1){
+        /*if(photoType.indexOf('5') != -1){
             html += '<div style="color: #7DBC1A">电子签名</div>'
         }else {
             html += '<div style="color: #E02232">未上传电子签名</div>'
             flag = false;
-        }
+        }*/
     }else{
         html += '<div style="color: #E02232">未上传人脸照片</div>'
         html += '<div style="color: #E02232">未上传电子签名</div>'
         flag = false;
     }
-    if(contractId != '' && contractId != null  && contractId != 'null'){
+    /*if(contractId != '' && contractId != null  && contractId != 'null'){
         html += '<div style="color: #7DBC1A">合同</div>'
     }else{
         html += '<div style="color: #E02232">未上传合同或合同已失效</div>'
         flag = false;
-    }
+    }*/
     if(realityTeamId != '' && realityTeamId != null && realityTeamId != 'null'){
         html += '<div style="color: #7DBC1A">班组</div>'
     }else{