From 254902d86f4a11fd409962960ff4746b145e9bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=8D=BF=E5=8D=8E?= <wuqinghua@hotmail.com>
Date: Fri, 21 Oct 2022 10:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=96=E5=B7=A5=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zehong/system/mapper/TNfcSettingMapper.java  | 7 +++++++
 .../system/service/impl/TNfcSettingServiceImpl.java       | 8 +++++++-
 .../main/resources/mapper/system/TNfcSettingMapper.xml    | 5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java b/danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java
index 6941536..004fcbf 100644
--- a/danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java
+++ b/danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java
@@ -73,4 +73,11 @@ public interface TNfcSettingMapper
      * @return
      */
     List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
+
+    /**
+     * �ヨ�nfc膽��傑����群膸閿���
+     * @param nfcNum
+     * @return
+     */
+    int getNfcNum(String nfcNum);
 }
diff --git a/danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java b/danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java
index ebbd511..488fd92 100644
--- a/danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java
+++ b/danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java
@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.TNfcRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,8 +81,13 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
     @Transactional
     public int updateTNfcSetting(TNfcSetting tNfcSetting)
     {
+        if (tNfcSetting.getNfcNum()==null||tNfcSetting.getNfcNum().equals("")){
+            int a = tNfcSettingMapper.updateTNfcSetting(tNfcSetting);
+            return a;
+        }
         TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
-        if(ts.getNfcId()!=tNfcSetting.getNfcId()){
+        int nfcNum = tNfcSettingMapper.getNfcNum(tNfcSetting.getNfcNum());
+        if (nfcNum!=0){
             ts.setNfcNum("");
             tNfcSettingMapper.updateTNfcSetting(ts);
         }
diff --git a/danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml b/danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml
index 263ecde..c8e2f30 100644
--- a/danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml
+++ b/danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml
@@ -110,4 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
 			group by a.create_time desc
     </select>
+
+    <!--�ヨ�nfc膽��傑����群膸閿���-->
+    <select id="getNfcNum" resultType="java.lang.Integer">
+        select count(nfc_id) from t_nfc_setting  where nfc_num=#{nfcNum}
+    </select>
 </mapper>
-- 
2.18.1