修改查询

danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TNfcSettingMapper;
 import com.zehong.system.domain.TNfcSetting;
 import com.zehong.system.service.ITNfcSettingService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * settingService业务层处理
@@ -75,9 +76,16 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateTNfcSetting(TNfcSetting tNfcSetting)
     {
-        return tNfcSettingMapper.updateTNfcSetting(tNfcSetting);
+        TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
+        if(ts.getNfcId()!=tNfcSetting.getNfcId()){
+            ts.setNfcNum("");
+            tNfcSettingMapper.updateTNfcSetting(ts);
+        }
+        int a = tNfcSettingMapper.updateTNfcSetting(tNfcSetting);
+        return a;
     }
 
     /**

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml

@@ -23,9 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTNfcSettingVo"/>
         <where>
             is_del='0'
-            and
-            region = #{region}
-            <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
+            <if test="region != null"> and region = #{region}</if>
+            <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address like concat('%',#{patrolAddress},'%') </if>
             <if test="nfcNum != null  and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
         </where>
         order  by patrol_sort