purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决微信与用户绑定的bug

Browse Source
This commit is contained in:
jishenghua
2024-04-02 23:52:51 +08:00
parent de95be05f6
commit 4f8524e688
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -3,9 +3,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants; 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.Tenant;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.entities.UserEx; 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.role.RoleService;
import com.jsh.erp.service.tenant.TenantService; import com.jsh.erp.service.tenant.TenantService;
import com.jsh.erp.service.user.UserService; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.util.HashMap;
import java.security.NoSuchAlgorithmException; import java.util.List;
import java.util.*; import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
@@ -97,6 +94,7 @@ public class UserController {
res.code = 501; res.code = 501;
res.data = "微信未绑定"; res.data = "微信未绑定";
} else { } else {
logger.info("微信登录:" + user.getLoginName());
Map<String, Object> data = userService.login(user, request); Map<String, Object> data = userService.login(user, request);
res.code = 200; res.code = 200;
res.data = data; res.data = data;

5
jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml
View File

@@ -153,7 +153,8 @@
</select> </select>
<update id="updateUserWithWeixinOpenId"> <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}
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'); where u.login_name = #{loginName} and u.password = #{password}
and ifnull(u.status,'0') not in('1','2')
</update> </update>
</mapper> </mapper>