Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -59,7 +59,10 @@
         LEFT JOIN tb_role r
         ON r.`id` = u.`role_type`
         <where>
-            u.parent_id = #{user.id}
+            u.id != #{user.id}
+            <if test="user.id != 1">
+                AND u.parent_id = #{user.id}
+            </if>
             <if test="flag==0 and keyName != '' and keyName !=null">
                AND u.username like concat('%',#{keyName},'%')
             </if>