diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 955db8360..f9425d9d1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -1757,8 +1757,14 @@ public class SysUserController { @GetMapping(value = "/queryViewerInfo") public ViewerInfoVo queryViewerInfoVo(@RequestParam(name = "userId", required = true) String userId){ ViewerInfoVo viewerInfoVo = new ViewerInfoVo(); - viewerInfoVo.setBrandList(projectUserBrandService.queryBrandByUserId(userId)); - viewerInfoVo.setDutyTerritoryList(projectUserDutyTerritoryService.queryDutyTerritoryByUserId(userId)); + List brands = projectUserBrandService.queryBrandByUserId(userId); + if (ObjectUtils.isNotEmpty(brands)) { + viewerInfoVo.setBrandList(brands); + } + List dutyTerritories = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(userId); + if (ObjectUtils.isNotEmpty(dutyTerritories)) { + viewerInfoVo.setDutyTerritoryList(dutyTerritories); + } return viewerInfoVo; } }