1.预警人员 和 预警记录 的完善

src/main/resources/mapper/AdminDao.xml

@@ -27,7 +27,8 @@
         a.tag_id as tagId,
         at.name as tagName,
         a.is_out as isOut,
-        a.is_hide_important as isHideImportant
+        a.is_hide_important as isHideImportant,
+        a.is_control_early_warning as isHideImportant
         FROM admin a left join admin_tag at on at.id = a.tag_id
         <where>
             <if test="type == 1">

src/main/resources/mapper/UserControlEarlyWarningListDao.xml

@@ -33,21 +33,21 @@
         Left join admin a on a.id = u.admin_id
         <where>
             <if test="adminVO.type == 2">
-                and a.province_id = #{adminVo.provinceId}
+                and a.province_id = #{adminVO.provinceId}
                 and a.type in (3 ,4 ,5)
             </if>
             <if test="adminVO.type == 3">
-                and a.province_id = #{adminVo.provinceId}
+                and a.province_id = #{adminVO.provinceId}
                 and a.type in (4 , 5)
-                and a.tag_id = #{adminVo.tagId}
+                and a.tag_id = #{adminVO.tagId}
             </if>
             <if test="adminVO.type == 4">
-                and a.city_id = #{adminVo.cityId}
+                and a.city_id = #{adminVO.cityId}
                 and a.type = 5
-                and a.tag_id = #{adminVo.tagId}
+                and a.tag_id = #{adminVO.tagId}
             </if>
             <if test="adminVO.type == 5">
-                and a.id =#{adminVo.adminId}
+                and u.admin_id =#{adminVO.adminId}
             </if>
 
 

src/main/resources/mapper/UserControlEarlyWarningListLogDao.xml

@@ -55,7 +55,7 @@
                 and e.tag_id = #{tagId}
             </if>
             <if test="type == 5">
-                and e.id =#{adminId}
+                and e.id =#{id}
             </if>
         </where>
         ORDER BY a.id DESC
@@ -95,7 +95,7 @@
                 and e.tag_id = #{adminVo.tagId}
             </if>
             <if test="adminVo.type == 5">
-                and e.id =#{adminVo.adminId}
+                and e.id =#{adminVo.id}
             </if>
             <if test="qu.status != 0 ">
                 and a.status =#{qu.status}
@@ -160,7 +160,7 @@
                 and e.tag_id = #{adminVo.tagId}
             </if>
             <if test="adminVo.type == 5">
-                and e.id =#{adminVo.adminId}
+                and e.id =#{adminVo.}
             </if>
             <if test="qu.status != 0 ">
                 and a.status =#{qu.status}