From 081b2afc94c32a1c5e735e2f6b971d9fe1ff9b4f Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期日, 28 九月 2025 09:15:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- server/system_service/src/main/java/com/doumee/api/BaseController.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 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 9e3ab4a..ffe898e 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 @@ -1,10 +1,10 @@ package com.doumee.api; import com.alibaba.fastjson.JSONObject; -import com.doumee.config.jwt.JwtProperties; +import com.doumee.config.jwt.JwtTokenUtil; 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; @@ -14,11 +14,9 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; /** * Controller鍩虹被 @@ -63,10 +61,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