Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

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

@@ -86,7 +86,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
             return a;
         }
         TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
-        if(ts.getNfcId()!=tNfcSetting.getNfcId()){
+        if(ts!=null&&ts.getNfcId()!=tNfcSetting.getNfcId()){
             ts.setNfcNum("");
             tNfcSettingMapper.updateTNfcSetting(ts);
         }

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

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.is_del='0' and b.dict_type='t_nfc_region'
             <if test="region != null  and region != ''"> and  region = #{region}</if>
-            <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</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>
             <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
                 and a.create_time &gt;= #{applyWorkStartTime}
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join sys_dict_data d on b.region=d.dict_value
         <where>
             b.is_del='0' and d.dict_type='t_nfc_region'
-            <if test="patrolAddress != null and patrolName != ''">
+            <if test="patrolAddress != null and patrolAddress != ''">
                 and b.patrol_address like concat('%', #{patrolAddress}, '%')
             </if>
             <if test="region != null and region != ''">