1.龙洞堡机场预警修改

src/main/java/com/yx/face/model/vo/UserControlEarlyWarningVO.java

@@ -41,5 +41,5 @@ public class UserControlEarlyWarningVO {
     private Date createTime;
 
     @ApiModelProperty(value = "账户Id")
-    private String adminId;
+    private Integer adminId;
 }

src/main/java/com/yx/face/service/impl/AdminServiceImpl.java

@@ -417,9 +417,20 @@ public class AdminServiceImpl implements AdminService {
     }
 
     @Override
-    public List<AdminVO> getAdminlist(JSONObject type) {
-        if (type != null && !type.isEmpty()) {
-            return adminDao.getAdminLsit(type.getInteger("type"));
+    public List<AdminVO> getAdminlist(JSONObject jsonObject) {
+        if (jsonObject != null && !jsonObject.isEmpty()) {
+            if(jsonObject.containsKey("adminListType")){
+                if(jsonObject.getInteger("adminListType") == 1){
+                    AdminVO info = getInfo();
+                    List<AdminVO> adminlist = adminDao.getAdminlist(info);
+                    adminlist.add(info);
+                    return adminlist;
+                }else {
+                    AdminVO info = getInfo();
+                    return adminDao.getAdminlist(info);
+                }
+            }
+            return adminDao.getAdminLsit(jsonObject.getInteger("type"));
         } else {
             AdminVO info = getInfo();
             return adminDao.getAdminlist(info);

src/main/resources/mapper/UserControlEarlyWarningListDao.xml

@@ -34,16 +34,16 @@
         <where>
             <if test="adminVO.type == 2">
                 and a.province_id = #{adminVO.provinceId}
-                and a.type in (3 ,4 ,5)
+                and a.type in (2,3,4,5)
             </if>
             <if test="adminVO.type == 3">
                 and a.province_id = #{adminVO.provinceId}
-                and a.type in (4 , 5)
+                and a.type in (3,4,5)
                 and a.tag_id = #{adminVO.tagId}
             </if>
             <if test="adminVO.type == 4">
                 and a.city_id = #{adminVO.cityId}
-                and a.type = 5
+                and a.type in(4,5)
                 and a.tag_id = #{adminVO.tagId}
             </if>
             <if test="adminVO.type == 5">