Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -207,7 +207,7 @@
         <include refid="menuColumns"/>
         FROM uims_menu a
         <where>
-            a.status=1 and a.PARENT_MENU_ID=0 and a.SHOW_STATE=1
+            a.status=1 and a.PARENT_MENU_ID=0 and a.SHOW_STATE=1 and  a.is_admin=1
         </where>
         order by a.seq
     </select>
@@ -289,7 +289,7 @@
         <include refid="menuColumns"/>
         FROM uims_menu a
         <where>
-            a.status=1 and  a.SHOW_STATE=1
+            a.status=1 and  a.SHOW_STATE=1 and a.is_admin=1
             <if test="appId != null  and appId != ''">
                 and a.app_id = #{appId}
             </if>

user_center/src/main/resources/mapper/UserMapper.xml

@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM uims_user a
 		<include refid="sysAreaJoins"/>
 		<where>
-            a.status=1
+            a.status=1 and a.user_type != -9999
             <if test="user.tenantId != null  and user.tenantId != ''"> and a.tenant_id = #{user.tenantId} </if>
             <if test="user.username != null  and user.username != ''">
                    and (a.username LIKE  concat('%',#{user.username},'%')