取消校验部门是否有数据权限

base-system/src/main/java/com/ozs/system/service/ISysDeptService.java

@@ -109,12 +109,12 @@ public interface ISysDeptService extends JoinIService<SysDept> {
      */
     public String checkDeptNameUnique(SysDept dept);
 
-    ///**
-    // * 校验部门是否有数据权限
-    // *
-    // * @param deptId 部门id
-    // */
-    //public void checkDeptDataScope(Long deptId);
+    /**
+     * 校验部门是否有数据权限
+     *
+     * @param deptId 部门id
+     */
+    public void checkDeptDataScope(Long deptId);
 
     /**
      * 新增保存部门信息

base-system/src/main/java/com/ozs/system/service/impl/SysDeptServiceImpl.java

@@ -191,22 +191,22 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
         return UserConstants.UNIQUE;
     }
 
-    ///**
-    // * 校验部门是否有数据权限
-    // *
-    // * @param deptId 部门id
-    // */
-    //@Override
-    //public void checkDeptDataScope(Long deptId) {
-    //    if (!SysUser.isAdmin(SecurityUtils.getId())) {
-    //        SysDeptVo dept = new SysDeptVo();
-    //        dept.setDeptId(deptId);
-    //        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
-    //        if (StringUtils.isEmpty(depts)) {
-    //            throw new ServiceException("没有权限访问部门数据！");
-    //        }
-    //    }
-    //}
+    /**
+     * 校验部门是否有数据权限
+     *
+     * @param deptId 部门id
+     */
+    @Override
+    public void checkDeptDataScope(Long deptId) {
+        if (!SysUser.isAdmin(SecurityUtils.getId())) {
+            SysDeptVo dept = new SysDeptVo();
+            dept.setDeptId(deptId);
+            List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+            if (StringUtils.isEmpty(depts)) {
+                throw new ServiceException("没有权限访问部门数据！");
+            }
+        }
+    }
 
     /**
      * 新增保存部门信息

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

@@ -41,23 +41,6 @@
         <if test="deptName != null and deptName != ''">
             AND dept_name like concat('%', #{deptName}, '%')
         </if>
-        <if test="!dsFlay">
-            and
-            <trim prefix="(" prefixOverrides="or" suffix=")">
-                <if test="dsUserId != null and dsUserId != ''">
-                    or d.create_by=#{dsUserId}
-                </if>
-                <if test="dsDeptId != null and dsDeptId != 0">
-                    or d.dept_id=#{dsDeptId}
-                </if>
-                <if test="dsDeptIds != null">
-                    or d.dept_id in
-                    <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                        #{item}
-                    </foreach>
-                </if>
-            </trim>
-        </if>
         order by d.parent_id, d.order_num
     </select>