From 2543d40046dc51f87564c5608fa72657cfbdb45e Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 16 Nov 2022 14:15:49 +0800
Subject: [PATCH] bug

---
 .../modules/system/controller/SysUserController.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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<String> brands = projectUserBrandService.queryBrandByUserId(userId);
+        if (ObjectUtils.isNotEmpty(brands)) {
+            viewerInfoVo.setBrandList(brands);
+        }
+        List<String> dutyTerritories = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(userId);
+        if (ObjectUtils.isNotEmpty(dutyTerritories)) {
+            viewerInfoVo.setDutyTerritoryList(dutyTerritories);
+        }
         return viewerInfoVo;
     }
 }