From 324cc16882f4ecb7fb203506be92d78305c9688a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 6 Aug 2025 23:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/UserController.java     |  2 +-
 .../java/com/jsh/erp/filter/LogCostFilter.java     | 14 +++++++-------
 .../main/java/com/jsh/erp/service/UserService.java |  8 ++++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index eae2683c..a80eeb32 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -235,7 +235,7 @@ public class UserController extends BaseController {
         Long id = jsonObject.getLong("id");
         String password = "123456";
         String md5Pwd = Tools.md5Encryp(password);
-        int update = userService.resetPwd(md5Pwd, id);
+        int update = userService.resetPwd(md5Pwd, id, request);
         if(update > 0) {
             return returnJson(objectMap, SUCCESS, ErpInfo.OK.code);
         } else {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/filter/LogCostFilter.java b/jshERP-boot/src/main/java/com/jsh/erp/filter/LogCostFilter.java
index e17155e8..bf1ee38d 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/filter/LogCostFilter.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/filter/LogCostFilter.java
@@ -13,9 +13,7 @@ import java.io.IOException;
 
 @WebFilter(filterName = "LogCostFilter", urlPatterns = {"/*"},
         initParams = {@WebInitParam(name = "filterPath",
-                      value = "/jshERP-boot/user/login#/jshERP-boot/user/weixinLogin#/jshERP-boot/user/weixinBind#" +
-                              "/jshERP-boot/user/registerUser#/jshERP-boot/user/randomImage#" +
-                              "/jshERP-boot/platformConfig/getPlatform#/jshERP-boot/v2/api-docs#/jshERP-boot/webjars#" +
+                      value = "/jshERP-boot/platformConfig/getPlatform#/jshERP-boot/v2/api-docs#/jshERP-boot/webjars#" +
                               "/jshERP-boot/systemConfig/static#/jshERP-boot/api/plugin/wechat/weChat/share#" +
                               "/jshERP-boot/api/plugin/general-ledger/pdf/voucher#/jshERP-boot/api/plugin/tenant-statistics/tenantClean")})
 public class LogCostFilter implements Filter {
@@ -46,21 +44,23 @@ public class LogCostFilter implements Filter {
             chain.doFilter(request, response);
             return;
         }
-        if (requestUrl != null && (requestUrl.contains("/doc.html") ||
-            requestUrl.contains("/user/login") || requestUrl.contains("/user/register"))) {
+        if (requestUrl != null && (requestUrl.equals("/jshERP-boot/doc.html") ||
+            requestUrl.equals("/jshERP-boot/user/login") || requestUrl.equals("/jshERP-boot/user/register")
+                || requestUrl.equals("/jshERP-boot/user/weixinLogin") || requestUrl.equals("/jshERP-boot/user/weixinBind")
+                || requestUrl.equals("/jshERP-boot/user/registerUser") || requestUrl.equals("/jshERP-boot/user/randomImage"))) {
             chain.doFilter(request, response);
             return;
         }
         if (null != allowUrls && allowUrls.length > 0) {
             for (String url : allowUrls) {
-                if (requestUrl.startsWith(url)) {
+                if (requestUrl != null && requestUrl.startsWith(url)) {
                     chain.doFilter(request, response);
                     return;
                 }
             }
         }
         servletResponse.setStatus(500);
-        if(requestUrl != null && !requestUrl.contains("/user/logout") && !requestUrl.contains("/function/findMenuByPNumber")) {
+        if(requestUrl != null && !requestUrl.equals("/jshERP-boot/user/logout") && !requestUrl.equals("/jshERP-boot/function/findMenuByPNumber")) {
             servletResponse.getWriter().write("loginOut");
         }
     }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java
index 87befcab..4e6f2cd8 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java
@@ -197,7 +197,7 @@ public class UserService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int resetPwd(String md5Pwd, Long id) throws Exception{
+    public int resetPwd(String md5Pwd, Long id, HttpServletRequest request) throws Exception{
         int result=0;
         logService.insertLog("用户",
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(),
@@ -211,7 +211,11 @@ public class UserService {
             user.setId(id);
             user.setPassword(md5Pwd);
             try{
-                result=userMapper.updateByPrimaryKeySelective(user);
+                //判断是否登录过
+                Object userId = redisService.getObjectFromSessionByKey(request,"userId");
+                if (userId != null) {
+                    result = userMapper.updateByPrimaryKeySelective(user);
+                }
             }catch(Exception e){
                 JshException.writeFail(logger, e);
             }