From cfc0736c25eb1b67decd112cb0fabe95f19778d8 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 26 七月 2022 10:26:18 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java | 8 ++++----
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
index ff557c8..efa24e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -62,7 +62,7 @@
su.nick_name
from com_pb_member as m
LEFT JOIN com_pb_org o ON m.org_id = o.id
- LEFT JOIN sys_user su ON o.user_id = su.user_id
+ LEFT JOIN sys_user su ON m.user_id = su.user_id
LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
LEFT JOIN com_mng_village cmv on m.village_id = cmv.village_id
LEFT JOIN com_act ca on m.community_id = ca.community_id
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java
index e394372..27a170b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java
@@ -98,7 +98,7 @@
R r = userService.getMcsUserByOpenId(openid);
if (R.isOk(r) && nonNull(r.getData())) {
McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
- return tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
+ return tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(), this.getAppId());
}
LoginReturnVO loginReturnVO = new LoginReturnVO();
loginReturnVO.setOpenId(openid);
@@ -132,7 +132,7 @@
McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
isValid = loginUserInfoVO.getStatus() == 1;
if (isValid) {
- R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
+ R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(), this.getAppId());
return result;
} else {
return R.fail("账号被禁用");
@@ -167,7 +167,7 @@
throw new ServiceException("登录错误超过限制,请五分钟后重试");
}
}
- R result = tokenService.loginMcsUser(account, password);
+ R result = tokenService.loginMcsUser(account, password, this.getAppId());
return result;
} else {
return R.fail("账号被禁用");
@@ -200,7 +200,7 @@
McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
isValid = loginUserInfoVO.getStatus() == 1;
if (isValid) {
- R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
+ R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(), this.getAppId());
return result;
} else {
return R.fail("账号被禁用");
--
Gitblit v1.7.1