修正

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/controller/ISysDeptController.java

@@ -0,0 +1,97 @@
+package cn.xluobo.business.sys.admin.controller;
+
+
+import cn.xluobo.business.sys.admin.domain.req.ReqSearchSysDept;
+import cn.xluobo.business.sys.admin.domain.resp.RespTreeSelect;
+import cn.xluobo.business.sys.admin.service.BusinessSysDeptService;
+import cn.xluobo.core.api.APIResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 前端控制器
+ * </p>
+ *
+ * @author zhangby
+ * @since 2020-01-18
+ */
+@RestController
+@RequestMapping("/api/system/dept")
+public class ISysDeptController {
+
+    @Autowired
+    private BusinessSysDeptService sysDeptService;
+
+    /**
+     * 列表
+     *
+     * @param reqSearchSysDept
+     * @return
+     */
+    @GetMapping("/list/searchList")
+    public APIResponse searchList(ReqSearchSysDept reqSearchSysDept) {
+        return sysDeptService.searchList(reqSearchSysDept);
+    }
+
+    /**
+     * 详情
+     *
+     * @param deptId
+     * @return
+     */
+    @GetMapping("/info/detailById/{deptId}")
+    public APIResponse detailById(@PathVariable("deptId") Long deptId) {
+        return sysDeptService.detailById(deptId);
+    }
+
+    /**
+     * 校区列表
+     *
+     * @return
+     */
+    @GetMapping("/list/campusList")
+    public APIResponse campusList() {
+        List<RespTreeSelect> respTreeSelects = sysDeptService.campusList();
+        return APIResponse.toAPIResponse(respTreeSelects);
+    }
+
+    /**
+     * 校区列表
+     *
+     * @return
+     */
+    @GetMapping("/list/campusListLimitByUser")
+    public APIResponse campusListLimitByUser() {
+        List<RespTreeSelect> respTreeSelects = sysDeptService.campusListLimitByUser();
+        return APIResponse.toAPIResponse(respTreeSelects);
+    }
+
+    /**
+     * 可选校区类型
+     * 如果拥有全部校区权限，返回全部校区 部分校区
+     * 否二 返回 部分校区
+     *
+     * @return
+     */
+    @GetMapping("/list/campusSelect")
+    public APIResponse campusSelect() {
+        List<RespTreeSelect> respTreeSelects = sysDeptService.campusSelect();
+        return APIResponse.toAPIResponse(respTreeSelects);
+    }
+
+    /**
+     * 可选校区类型
+     * 如果拥有全部校区权限，返回全部校区 部分校区
+     * 否二 返回 部分校区
+     *
+     * @return
+     */
+    @GetMapping("/list/campusSelectLimitByUser")
+    public APIResponse campusSelectLimitByUser() {
+        List<RespTreeSelect> respTreeSelects = sysDeptService.campusSelectLimitByUser();
+        return APIResponse.toAPIResponse(respTreeSelects);
+    }
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java

@@ -129,4 +129,56 @@ public class BusinessSysDeptService {
         return respTreeSelects;
     }
 
+    /**
+     * 前端select
+     *
+     * @return
+     */
+    public List<RespTreeSelect> campusListLimitByUser() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<SysDept> deptList = sysDeptService.selectUserCampusList(loginUser.getUserId());
+        List<RespTreeSelect> respTreeSelects = deptList.stream().map(RespTreeSelect::new).collect(Collectors.toList());
+        return respTreeSelects;
+    }
+
+    /**
+     * 校区选择
+     * 如果拥有全部校区权限，返回全部校区 部分校区
+     * 否二 返回 部分校区
+     *
+     * @return
+     */
+    public List<RespTreeSelect> campusSelect() {
+
+        List<RespTreeSelect> list = Lists.newArrayList();
+
+        list.add(new RespTreeSelect(9L,"全部校区",null));
+        list.add(new RespTreeSelect(0L,"部分校区",null));
+
+        return list;
+    }
+
+    /**
+     * 校区选择
+     * 如果拥有全部校区权限，返回全部校区 部分校区
+     * 否二 返回 部分校区
+     *
+     * @return
+     */
+    public List<RespTreeSelect> campusSelectLimitByUser() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        List<RespTreeSelect> list = Lists.newArrayList();
+
+        QueryWrapper qw = new QueryWrapper();
+        qw.eq("user_id",loginUser.getUserId());
+        qw.eq("dept_id","-1");
+        SysUserDept one = userDeptService.getOne(qw);
+        if(null != one){
+            list.add(new RespTreeSelect(9L,"全部校区",null));
+        }
+        list.add(new RespTreeSelect(0L,"部分校区",null));
+
+        return list;
+    }
 }

ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java

@@ -30,13 +30,13 @@ public class MybatisConfiguration {
     @ConditionalOnMissingBean(PaginationInterceptor.class)
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        List<ISqlParser> sqlParserList = new ArrayList<>();
-
-        TenantSqlParser tenantSqlParser = new MyTenantParser();
-        tenantSqlParser.setTenantHandler(new MyTenantHandler());
-        sqlParserList.add(tenantSqlParser);
-
-        paginationInterceptor.setSqlParserList(sqlParserList);
+//        List<ISqlParser> sqlParserList = new ArrayList<>();
+//
+//        TenantSqlParser tenantSqlParser = new MyTenantParser();
+//        tenantSqlParser.setTenantHandler(new MyTenantHandler());
+//        sqlParserList.add(tenantSqlParser);
+//
+//        paginationInterceptor.setSqlParserList(sqlParserList);
         return paginationInterceptor;
     }
 

ruoyi-admin/src/main/java/cn/xluobo/config/security/CustomAccessDecisionManager.java

@@ -14,7 +14,7 @@ import java.util.Iterator;
 /**
  * Created by zhangbaoyu on 18/1/9.
  */
-@Service
+//@Service
 public class CustomAccessDecisionManager implements AccessDecisionManager {
 
     // decide 方法是判定是否拥有权限的决策方法，

ruoyi-admin/src/main/java/cn/xluobo/config/security/CustomAuthenticationSuccessHandler.java

@@ -26,7 +26,7 @@ import java.io.PrintWriter;
  * @author ：zhangbaoyu
  * @date ：Created in 2020-02-27 17:41
  */
-@Component
+//@Component
 public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
 
     private RequestCache requestCache = new HttpSessionRequestCache();

ruoyi-admin/src/main/java/cn/xluobo/config/security/CustomSecurityMetadataSource.java

@@ -16,7 +16,7 @@ import java.util.*;
 /**
  * Created by zhangbaoyu on 18/1/9.
  */
-@Component
+//@Component
 public class CustomSecurityMetadataSource implements FilterInvocationSecurityMetadataSource {
 
     private HashMap<String, Collection<ConfigAttribute>> map =null;