Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/dao/UserControlEarlyWarningListDao.java

@@ -27,6 +27,7 @@ public interface UserControlEarlyWarningListDao extends TKMapper<UserControlEarl
      * @param idNumber  身份证
      * @param isControlEarlyWarning 是否开启 1 开启2 否
      * @return
+     * 2022-01-29  修改 isControlEarlyWarning 这个只做前端的判定，不对后端的逻辑进行处理
      */
     AdminAndUserEarlyWarningVO getAdminWarningInformation(@Param("deviceSn") String deviceSn, @Param("idNumber") String idNumber, @Param("isControlEarlyWarning") Integer isControlEarlyWarning);
 }

src/main/resources/mapper/UserControlEarlyWarningListDao.xml

@@ -75,14 +75,16 @@
 
     </select>
     <select id="getAdminWarningInformation" resultType="com.yx.face.model.vo.AdminAndUserEarlyWarningVO">
-        SELECT c.control_name as controlName , c.control_phone  as controlPhone ,c.control_unit  as controlUnit, c.admin_id as adminId  FROM face_device as a
-                          LEFT JOIN admin as b
-                                    on a.admin_id = b.id
-                          LEFT JOIN user_control_early_warning_list as c
-                                    on b.id  = c.admin_id
+        SELECT
+               c.control_name as controlName ,
+               c.control_phone  as controlPhone ,
+               c.control_unit  as controlUnit,
+               c.admin_id as adminId
+        FROM face_device as a
+        LEFT JOIN admin as b on a.admin_id = b.id
+        LEFT JOIN user_control_early_warning_list as c on b.id  = c.admin_id
         WHERE a.sn = #{deviceSn}
           and c.early_warning_id_number = #{idNumber}
-          and b.is_control_early_warning = #{isControlEarlyWarning}
     </select>
 
 </mapper>