Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-05-07 d350c048b8cef4aff88391ad35f9db3ac3de26b8

 ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -71,6 +71,10 @@
      select * from sys_dept where find_in_set(#{deptId}, ancestors)
   </select>
   
   <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="java.lang.Integer">
      select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
   </select>
	
   <select id="checkDeptNameUnique" resultMap="SysDeptResult">
       <include refid="selectDeptVo"/>
      where dept_name=#{deptName} and parent_id = #{parentId}