From 2cc4ff419e5ad9abdc70556146adb4af4d258af3 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 01 十一月 2022 11:13:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java index 736b909..b01003d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java @@ -364,6 +364,13 @@ set.add(sysRoleDO.getRoleKey()); }); } + //是否为人大代表 + if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){ + int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName()); + if (i>0){ + loginUserInfoVO.setIsDpcMember(1); + } + } return R.ok(loginUserInfoVO); } @@ -510,6 +517,13 @@ ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone()); if (nonNull(expertVO)){ loginUserInfoVO.setType(13); + } + //是否为人大代表 + if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){ + int i = userDao.isDpcMember(phone, sysUserDO.getName()); + if (i>0){ + loginUserInfoVO.setIsDpcMember(1); + } } return R.ok(loginUserInfoVO); } @@ -3619,7 +3633,7 @@ String accessToken = ""; WxXCXTempSend util = new WxXCXTempSend(); try { - accessToken = util.getAccessToken(); + accessToken = util.getAccessToken("wx118de8a734d269f0"); } catch (Exception e) { e.printStackTrace(); } -- Gitblit v1.7.1