diff --git a/src/main/java/com/yunhai/userhome/controller/api/UserSettingsController.java b/src/main/java/com/yunhai/userhome/controller/api/UserSettingsController.java
index 57db3bb..cccab2c 100644
--- a/src/main/java/com/yunhai/userhome/controller/api/UserSettingsController.java
+++ b/src/main/java/com/yunhai/userhome/controller/api/UserSettingsController.java
@@ -19,6 +19,7 @@ import com.yunhai.userhome.service.AppIconKeyService;
import com.yunhai.userhome.service.ISchSettingsService;
import com.yunhai.userhome.service.IUserCurrentRoleService;
import com.yunhai.userhome.service.IUserSettingsService;
+import com.yunhai.userhome.service.IWidgetCatalogService;
import com.yunhai.userhome.service.UsedAppService;
import com.yunhai.userhome.utils.EnumUtil;
import com.yunhai.userhome.utils.FileUtil;
@@ -34,11 +35,6 @@ import java.util.stream.Collectors;
/**
* 用户设置控制器(对齐旧 UserHome contorller.api.UserSettingsController)。
- *
- *
待确认接口(已写入待确认清单):
- *
- * - getUserSettings 中 bschBaseOpenApi.getPcGrzxPage —— 新框架 YschBaseOpenApi 是否有此方法待确认
- *
*/
@RestController
@RequestMapping(Config.API_PATH)
@@ -68,6 +64,9 @@ public class UserSettingsController {
@Autowired
private AppIconKeyService appIconKeyService;
+ @Autowired
+ private IWidgetCatalogService widgetCatalogService;
+
// ==================== 壁纸 ====================
/**
@@ -288,9 +287,8 @@ public class UserSettingsController {
Integer schId = currentRoleOpt.isPresent() ? currentRoleOpt.get().getSchId() : null;
UserSettings model = new UserSettings();
Optional optional = userSettingsService.findUserSettings(authUserWithDept.getId());
- // TODO 待确认:bschBaseOpenApi.getPcGrzxPage —— 新框架 YschBaseOpenApi 是否有此方法待确认
- // List appPageList = bschBaseOpenApi.getPcGrzxPage(authUserWithDept.getId(), schId);
- List appPageList = Collections.emptyList();
+ // 候选池真源 = 自建 widget_catalog(enabled=1,sch_id 按校过滤;NULL=全校)
+ List catalogList = widgetCatalogService.findEnabledForSchool(schId);
if (optional.isPresent()) model = optional.get();
// 壁纸池一次取全:悬空自愈判定与兜底选择共用
List wallList = userSettingsService.findWallList(authUserWithDept.getId());
@@ -303,12 +301,14 @@ public class UserSettingsController {
if (model.getWallpaperUrl() == null || model.getWallpaperUrl().isEmpty()) {
model.setWallpaperUrl(resolveFallbackWallpaper(authUserWithDept, schId, wallList));
}
- List