commit

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -148,6 +148,7 @@ public class SysHomeController {
         List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
         List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList();
         List<Sys_menu> sysMenus = list.stream()
+                .filter(m -> allMenuIds.contains(m.getId()))
                 .sorted(Comparator.comparing(Sys_menu::getLocation, Comparator.nullsLast(Integer::compareTo))
                         .thenComparing(Sys_menu::getId))
                 .toList();
@@ -166,8 +167,11 @@ public class SysHomeController {
         );
         List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
         List<String> allMenuIds = menus.stream().map(Sys_menu::getId).toList();
-        //List<Sys_menu> sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
-        List<Sys_menu> sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList();
+        List<Sys_menu> sysMenus = list.stream()
+                .filter(m -> allMenuIds.contains(m.getId()))
+                .sorted(Comparator.comparing(Sys_menu::getLocation, Comparator.nullsLast(Integer::compareTo))
+                        .thenComparing(Sys_menu::getId))
+                .toList();
         return Result.success(sysMenus);
     }
 

src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java

@@ -125,7 +125,7 @@ public class CommonController {
     @At
     @SaCheckLogin
     @ApiOperation("单位列表")
-    public Result unitOptions(String unionId) {
+    public Result unitOptions(String unionId, Integer unitLevel) {
         Sql sql = Sqls.create("""
                 SELECT
                 	unit.*,
@@ -138,6 +138,8 @@ public class CommonController {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("unit.unionId", "=", unionId);
         cnd.and("unit.unitTypeCode", "=", "1");
+        // unitLevel 为可选筛选条件，不传时保持原有单位列表查询逻辑。
+        cnd.andEX("unit.unitLevel", "=", unitLevel);
         cnd.asc("unit.unitcode");
         sql.setCondition(cnd);
         List<NutMap> unitList = sysUserService.listMap(sql);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java

@@ -329,7 +329,7 @@ public class TrainSignUpManageController {
 	public Result selectUnitAndClub() {
 		List<NutMap> result = new ArrayList<>();
 		java.util.Set<String> optionKeys = new java.util.HashSet<>();
-		List<Sys_unit> unitList = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2).asc(Sys_unit::getUnitcode));
+		List<Sys_unit> unitList = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 3).asc(Sys_unit::getUnitcode));
 		for (Sys_unit unit : unitList) {
 			addSelectOption(result, optionKeys, unit.getId(), unit.getName(), "unit");
 		}

src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionManageController.java

@@ -241,10 +241,15 @@ public class ActivityWorksCollectionManageController {
     @SaCheckPermission(value = {"activity.workscollection.manage", "activity.workscollection.new"}, mode = SaMode.OR)
     public Result findOne(@Valid String id) {
         Activity_works_collection worksCollection = dao.fetch(Activity_works_collection.class, id);
+        if (worksCollection == null) {
+            return Result.error("活动不存在");
+        }
         dao.fetchLinks(worksCollection, "subjectTypes");
-        worksCollection.getSubjectTypes().forEach(item -> {
-            dao.fetchLinks(item, "worksTypes");
-        });
+        if (worksCollection.getSubjectTypes() != null) {
+            worksCollection.getSubjectTypes().forEach(item -> {
+                dao.fetchLinks(item, "worksTypes");
+            });
+        }
         return Result.success(worksCollection);
     }