Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 201518a621d0d5f3c2040217950b10a5eaba22e6

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -274,7 +274,13 @@
   </select>
    <select id="selectUserByDeptId" resultType="com.ruoyi.common.core.domain.entity.SysUser">
   select  * from sys_user
   where deptId = #{id}
   where 1=1
      <if test="ids != null and ids.size()>0">
         AND deptId IN
         <foreach collection="ids" separator="," item="id" open="(" close=")">
            #{id}
         </foreach>
      </if>
   and status = 0
   and del_flag = 0
   </select>