fix(auth): 修复权限判断逻辑错误

linwei

3 days ago 8754350da1af538787b239530b950a15a351ab8a

fix(auth): 修复权限判断逻辑错误

- 修正了管理员权限检查的逻辑运算符
- 将错误的 OR 条件更正为正确的 AND 条件
- 确保只有非管理员用户才会应用部门数据过滤
- 修复了工作订单和巡检任务的数据访问权限控制

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -103,7 +103,7 @@
    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
        List<Long> deptList = new ArrayList<>();
        if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
        if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
        }
        gdPatrolTask.setDeptList(deptList);

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java

@@ -61,7 +61,7 @@
    public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
        if (gdWorkOrder.getIsQueryAll()) {
            List<Long> deptList = new ArrayList<>();
            if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
            if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
                deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            }
            gdWorkOrder.setDeptList(deptList);