Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -21,6 +21,7 @@ import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.service.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -80,8 +81,13 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
                 if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
                     throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
                 }
-
+                if(apiResp.getData().get("data")!=null) {
                     data.put("siteList", apiResp.getData().get("data"));
+                }else {
+                    data.put("siteList", Collections.emptyList());
+                }
+            }else {
+                data.put("siteList", Collections.emptyList());
             }
 
             recordSysLog(request, userEntity, "用户登录系统成功!");