Browse Source

查询登录用户状态修改

wangli 4 years ago
parent
commit
797af459ab

+ 1 - 1
smart-city-platform/src/main/java/com/bz/smart_city/commom/util/jsonSerializer/ValveStateJsonSerializer.java

@@ -21,7 +21,7 @@ public class ValveStateJsonSerializer extends JsonSerializer<String> {
             gen.writeString("关阀");
         }else
         if(value != null && value .equals("1")){
-            gen.writeString("1开阀");
+            gen.writeString("开阀");
         }else
         if(value != null && value .equals("2")){
             gen.writeString("无阀");

+ 1 - 1
smart-city-platform/src/main/resources/mapper/UserMapper.xml

@@ -138,7 +138,7 @@
 
     <select id="findUserList" resultType="com.bz.smart_city.dto.UserRoleDto">
         SELECT su.*,(SELECT GROUP_CONCAT(ss.name SEPARATOR '、') FROM sc_site_user ssu LEFT JOIN sc_site ss on(ss.id = ssu.site_id and ss.`status`= 1)  WHERE ssu.user_id = su.id and ssu.`status` =1) as site_name FROM sc_user su
-        WHERE 1 = 1 and su.status = 1  and su.is_super_admin = 0
+        WHERE 1 = 1 and su.status != 0  and su.is_super_admin = 0
         <if test="username != null and username != ''"> AND su.username LIKE concat('%',#{username},'%')</if>
         <if test="name != null and name != ''"> AND su.`name` LIKE concat('%',#{name},'%')</if>
         <if test="mobilePhone != null and mobilePhone != ''"> AND su.mobile_phone LIKE concat('%',#{mobilePhone},'%')</if>