From 4f8524e688ee6d82c0695e977d7ca1e20f216ebb Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 2 Apr 2024 23:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AE=E4=BF=A1=E4=B8=8E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/UserController.java | 18 ++++++++----------
 .../main/resources/mapper_xml/UserMapperEx.xml |  5 +++--
 2 files changed, 11 insertions(+), 12 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 027be12a..5282dd69 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
@@ -3,9 +3,7 @@ package com.jsh.erp.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.constants.ExceptionConstants;
-import com.jsh.erp.datasource.entities.SysLoginModel;
 import com.jsh.erp.datasource.entities.Tenant;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.entities.UserEx;
@@ -16,24 +14,23 @@ import com.jsh.erp.service.redis.RedisService;
 import com.jsh.erp.service.role.RoleService;
 import com.jsh.erp.service.tenant.TenantService;
 import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.*;
+import com.jsh.erp.utils.BaseResponseInfo;
+import com.jsh.erp.utils.ErpInfo;
+import com.jsh.erp.utils.RandImageUtil;
+import com.jsh.erp.utils.Tools;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
 
@@ -97,6 +94,7 @@ public class UserController {
                 res.code = 501;
                 res.data = "微信未绑定";
             } else {
+                logger.info("微信登录:" + user.getLoginName());
                 Map<String, Object> data = userService.login(user, request);
                 res.code = 200;
                 res.data = data;
diff --git a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
index 5fb9f9cb..964b72d9 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -153,7 +153,8 @@
     </select>
 
     <update id="updateUserWithWeixinOpenId">
-        update jsh_user u set u.weixin_open_id = null where u.weixin_open_id = #{weixinOpenId};
-        update jsh_user u set u.weixin_open_id = #{weixinOpenId} where u.login_name = #{loginName} and u.password = #{password} and ifnull(u.status,'0') not in('1','2');
+        update jsh_user u set u.weixin_open_id = #{weixinOpenId}
+        where u.login_name = #{loginName} and u.password = #{password}
+        and ifnull(u.status,'0') not in('1','2')
     </update>
 </mapper>
\ No newline at end of file