修改

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/mapper/MeterBaseRfidInfoMapper.xml

@@ -267,24 +267,24 @@
   </select>
   <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
-    where 1!=1
+    where 1=1
     <if test="rfidCode != null and rfidCode != ''">
-      or RFID_CODE = #{rfidCode}
+      and RFID_CODE = #{rfidCode}
     </if>
     <if test="carNo != null and carNo != ''">
-      or CAR_NO = #{carNo}
+      and CAR_NO = #{carNo}
     </if>
     <if test="createManNo != null and createManNo != ''">
-      or CREATE_MAN_NO = #{createManNo}
+      and CREATE_MAN_NO = #{createManNo}
     </if>
     <if test="createManName != null and createManName != ''">
-      or CREATE_MAN_NAME = #{createManName}
+      and CREATE_MAN_NAME = #{createManName}
     </if>
     <if test="createTime != null">
-      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      or VALUE_FLAG = #{valueFlag}
+      and VALUE_FLAG = #{valueFlag}
     </if>
   </select>
 

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1101,10 +1101,16 @@
 
   <select id="selectSpotByUserID"  parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select * from METER_BASE_SPOT_INFO where BASE_SPOT_NO not in (select BASE_SPOT_NO from METER_BASE_USER_SPOT where USER_ID = '${userID}')
+        and VALID_FLAG != '0'
+    order by base_spot_name asc
   </select>
 
   <select id="selectSpotByConfigUserID"  parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    select * from METER_BASE_SPOT_INFO where BASE_SPOT_NO not in (select BASE_SPOT_NO from METER_BASE_USER_SPOT_config where USER_ID = '${userID}')
+    select * from METER_BASE_SPOT_INFO
+    where BASE_SPOT_NO not in (select BASE_SPOT_NO from METER_BASE_USER_SPOT_config where USER_ID = '${userID}')
+        and spot_type_no = '001002001'
+        and VALID_FLAG != '0'
+    order by base_spot_name asc
   </select>