Kaynağa Gözat

加个状态

czh 2 yıl önce
ebeveyn
işleme
0df21c022c

+ 6 - 0
sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -116,8 +116,14 @@ public class LoginResVo1 implements Serializable {
      */
     private String token;
 
+    /**
+     * 机构id
+     */
     private Long deptId;
 
+    /**
+     * 岗位角色id
+     */
     private Long roleId;
 
 }

+ 7 - 1
sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -320,7 +320,7 @@
     <select id="queryEntInfoByCityCodeAndEntTypesWithPage" resultType="com.sckw.system.model.KwsEnterprise">
       SELECT a.*
         FROM kws_enterprise a
-             LEFT JOIN sys_area b ON a.city_code = b.CODE
+        LEFT JOIN sys_area b ON a.city_code = b.CODE
       where 1 = 1
         <if test="cityCode != null">
           and (b.code = #{cityCode} or b.province_code = #{cityCode} or b.pcode = #{cityCode})
@@ -342,6 +342,12 @@
                             #{item}
                          </foreach>
                     )
+        and exists (
+                    select 1
+                      from kws_ent_check_track e
+                     where a.id = e.ent_id
+                       and a.status = 0
+                )
     </select>
 
   <select id="findManageInfoByEntIds" resultType="com.sckw.system.model.pojo.FindManagePojo">