From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/api/BaseController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/BaseController.java b/server/system_service/src/main/java/com/doumee/api/BaseController.java
index e431c04..b335103 100644
--- a/server/system_service/src/main/java/com/doumee/api/BaseController.java
+++ b/server/system_service/src/main/java/com/doumee/api/BaseController.java
@@ -3,7 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
 import com.doumee.core.utils.Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +32,7 @@
      * @author Eva.Caesar Liu
      * @date 2023/03/21 14:49
      */
-    protected LoginUserInfo getLoginUser (String token) {
+    public LoginUserInfo getLoginUser (String token) {
         if (token == null || token.isEmpty()) {
                return (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
 //            throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
@@ -60,10 +60,17 @@
     }
 
     public List<Integer> getIdList(String ids){
+        if(StringUtils.isBlank(ids)){
+            return null;
+        }
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
+            try {
+                idList.add(Integer.valueOf(id));
+            }catch (Exception e){
+
+            }
         }
         return idList;
     }

--
Gitblit v1.9.3