Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

2 天以前 40946ba6c24a0318f14cbed603f0ed9cad1da853

 src/main/resources/mapper/system/SysDeptMapper.xml

@@ -67,7 +67,7 @@
   </select>
    
    <select id="checkDeptExistUser" parameterType="Long" resultType="int">
      select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
      select count(1) from sys_user_dept where dept_id = #{deptId}
   </select>
   
   <select id="hasChildByDeptId" parameterType="Long" resultType="int">