jinxia.mo 1 месяц назад
Родитель
Сommit
03310c4ea1

+ 14 - 8
ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzAgentController.java

@@ -52,13 +52,8 @@ public class DzAgentController extends BaseController
     @Autowired
     private ISysUserService userService;
 
-    /**
-     * 查询机构代理列表
-     */
-    @PreAuthorize("@ss.hasPermi('dz:agent:list')")
-    @GetMapping("/list")
-    public AjaxResult list(DzAgent dzAgent)
-    {
+
+    private List<DzAgent> getAgent(DzAgent dzAgent){
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         List<DzAgent> allList = Lists.newArrayList();
         if(UserTypeEnum.isAgent(sysUser.getUserType())) {
@@ -67,7 +62,18 @@ public class DzAgentController extends BaseController
         } else if(!UserTypeEnum.isSys(sysUser.getUserType())) {
             dzAgent.setDeptId(sysUser.getDeptId());
         }
+
         allList.addAll(dzAgentService.selectDzAgentList(dzAgent));
+        return allList;
+    }
+    /**
+     * 查询机构代理列表
+     */
+    @PreAuthorize("@ss.hasPermi('dz:agent:list')")
+    @GetMapping("/list")
+    public AjaxResult list(DzAgent dzAgent)
+    {
+        List<DzAgent> allList = getAgent(dzAgent);
         //处理关联学校的显示
         List<Long> distinctSchoolIds = allList.stream()
                 .map(DzAgent::getSchoolIds)
@@ -107,7 +113,7 @@ public class DzAgentController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DzAgent dzAgent)
     {
-        List<DzAgent> list = dzAgentService.selectDzAgentList(dzAgent);
+        List<DzAgent> list = getAgent(dzAgent);
         // 设置机构名称
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(agent -> {