按类型返回年度，去掉部分代理商和部门，拆分校区界面

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

@@ -8,9 +8,12 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.dz.domain.DzSchool;
 import com.ruoyi.dz.service.IDzSchoolService;
+import com.ruoyi.enums.UserTypeEnum;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,6 +54,12 @@ public class DzAgentController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(DzAgent dzAgent)
     {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        if(UserTypeEnum.isAgent(sysUser.getUserType())) {
+            dzAgent.setParentId(sysUser.getUserTypeId());
+        } else if(!UserTypeEnum.isSys(sysUser.getUserType())) {
+            dzAgent.setDeptId(sysUser.getDeptId());
+        }
         List<DzAgent> list = dzAgentService.selectDzAgentList(dzAgent);
         //处理关联学校的显示
         List<Long> distinctSchoolIds = list.stream()

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCampusController.java

@@ -0,0 +1,147 @@
+package com.ruoyi.web.controller.dz;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.dz.domain.DzSchool;
+import com.ruoyi.dz.service.IDzSchoolService;
+import com.ruoyi.enums.UserTypeEnum;
+import com.ruoyi.system.domain.SysArea;
+import com.ruoyi.system.service.ISysAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 机构校区Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-12
+ */
+@RestController
+@RequestMapping("/dz/campus")
+public class DzCampusController extends BaseController
+{
+    @Autowired
+    private IDzSchoolService dzSchoolService;
+    @Autowired
+    private ISysAreaService areaService;
+
+    /**
+     * 查询机构校区列表
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DzSchool dzSchool)
+    {
+        dzSchool.setCampus(true);
+        if(!UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setDeptId(SecurityUtils.getDeptId());
+        }
+        startPage();
+        List<DzSchool> list= dzSchoolService.selectDzSchoolList(dzSchool);
+        //处理省市区
+        List<Long> areaIds = list.stream()
+                .flatMap(school -> Stream.of(
+                        school.getPro(),school.getCity(),school.getArea()
+                ))
+                .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(areaIds)){
+            Map<Long, SysArea> areaMap = areaService.selectSysAreaListByIds(areaIds)
+                    .stream().collect(Collectors.toMap(SysArea::getAreaId,area -> area));
+            list.forEach(school -> {
+                StringBuilder proCityAreaName = new StringBuilder();
+                if (null!=school.getPro()&&areaMap.containsKey(school.getPro())){
+                    proCityAreaName.append(areaMap.get(school.getPro()).getAreaName());
+                }
+                if (null!=school.getCity()&&areaMap.containsKey(school.getCity())){
+                    proCityAreaName.append(areaMap.get(school.getCity()).getAreaName());
+                }
+                if (null!=school.getArea()&&areaMap.containsKey(school.getArea())){
+                    proCityAreaName.append(areaMap.get(school.getArea()).getAreaName());
+                }
+                if (StringUtils.isNotEmpty(proCityAreaName.toString())){
+                    school.setProCityAreaName(proCityAreaName.toString());
+                }
+            });
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出机构校区列表
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:export')")
+    @Log(title = "机构校区", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DzSchool dzSchool)
+    {
+        dzSchool.setCampus(true);
+        if(!UserTypeEnum.isSys(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setDeptId(SecurityUtils.getDeptId());
+        }
+        List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
+        ExcelUtil<DzSchool> util = new ExcelUtil<DzSchool>(DzSchool.class);
+        util.exportExcel(response, list, "机构校区数据");
+    }
+
+    /**
+     * 获取机构校区详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dzSchoolService.selectDzSchoolById(id));
+    }
+
+    /**
+     * 新增机构校区
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:add')")
+    @Log(title = "机构校区", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DzSchool dzSchool)
+    {
+        if(null == dzSchool.getDeptId()) {
+            dzSchool.setDeptId(SecurityUtils.getDeptId());
+        }
+        return toAjax(dzSchoolService.insertDzSchool(dzSchool));
+    }
+
+    /**
+     * 修改机构校区
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:edit')")
+    @Log(title = "机构校区", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DzSchool dzSchool)
+    {
+        dzSchool.setDeptId(null);
+        return toAjax(dzSchoolService.updateDzSchool(dzSchool));
+    }
+
+    /**
+     * 删除机构校区
+     */
+    @PreAuthorize("@ss.hasPermi('dz:campus:remove')")
+    @Log(title = "机构校区", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dzSchoolService.deleteDzSchoolByIds(ids));
+    }
+}

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -126,21 +126,31 @@ public class UserController extends BaseController {
     @ApiOperation("毕业年份列表")
     public AjaxResult graduateYear(@RequestParam String location, @RequestParam ExamType examType)
     {
-        DzControl cond = new DzControl();
-        cond.setIsValid(1);
-        cond.setLocation(location);
-        List<DzControl> list = dzControlService.selectDzControlList(cond);
-        Integer year;
-        if(CollectionUtils.isEmpty(list) || null == (year = list.get(0).getSubmitYear())) {
-            year = Calendar.getInstance().get(Calendar.YEAR);
-        }
+//        DzControl cond = new DzControl();
+//        cond.setIsValid(1);
+//        cond.setLocation(location);
+//        List<DzControl> list = dzControlService.selectDzControlList(cond);
+//        Integer year;
+//        if(CollectionUtils.isEmpty(list) || null == (year = list.get(0).getSubmitYear())) {
+//            year = Calendar.getInstance().get(Calendar.YEAR);
+//        }
+//        List<JSONObject> resultList = new ArrayList<>();
+//        for(int i = year; i <= year + 6; i++) {
+//            JSONObject o = new JSONObject();
+//            o.put("dictValue", i);
+//            o.put("dictLabel", String.valueOf(i));
+//            resultList.add(o);
+//        }ss
+        int begin = 2026;
+        int end = ExamType.VHS.equals(examType) ? 2028 : 2026;
         List<JSONObject> resultList = new ArrayList<>();
-        for(int i = year; i <= year + 6; i++) {
+        for(int i = begin; i<= end; i++) {
             JSONObject o = new JSONObject();
             o.put("dictValue", i);
             o.put("dictLabel", String.valueOf(i));
             resultList.add(o);
         }
+
         return AjaxResult.success(resultList);
     }
 

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -37,7 +37,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取机构列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    // @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -249,7 +249,7 @@ public class SysUserController extends BaseController
     /**
      * 获取机构树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {