Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/handler/DataScopeType.java

@@ -71,13 +71,13 @@ public enum DataScopeType {
     /**
      * 数据归属部门数据权限
      */
-    TODEPT("9", " #{#todeptName} = #{#user.sysUser.dept.manageUnitFilter} ", ""),
+    TODEPT("9", " #{#todeptName} = #{#user.sysUser.dept.directly} ", ""),
 
     /**
      * 数据归属部门及以下数据权限
      */
 //    DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", ""),
-    TODEPT_AND_CHILD("10", " #{#todeptName} like concat('#{#user.sysUser.dept.manageUnitFilter}', '%') ", ""),
+    TODEPT_AND_CHILD("10", "   #{#todeptName} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{#user.sysUser.dept.directly} or find_in_set( #{#user.sysUser.dept.directly} , ancestors ) )", ""),
     TODEPT_AND_CHILD2("997", " #{#todeptName} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{#user.sysUser.dept.directly} or find_in_set( #{#user.sysUser.dept.directly} , ancestors ) )", "");
 
     /**