From 6c4db89ea8795d6be8431f698051e62bec9ec956 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 09:06:08 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 3d71c1e..f90f2c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -328,7 +328,7 @@
@ApiOperation(value = "党员认证")
@PostMapping("partybuildingembercertification")
public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
- //totest 党员认证
+ //党员认证
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
@@ -342,13 +342,15 @@
Object certUserInfo = certUser.getData();
boolean userCertified = false;
if (certUserInfo != null) {
- PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
- //已认证党员身份，直接返回
- userCertified = certUserVo.getAuditResult() == 1;
+ try {
+ PartyBuildingMemberVO certUserVo = JSONObject.parseObject(JSONObject.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
+ //已认证党员身份，直接返回
+ userCertified = certUserVo.getAuditResult() == 1;
+ }catch (Exception e){}
}
//匹配手机，验证是否进行自动确认
if (userCertified) {
- return R.fail("用户已完成党员认证");
+ return R.fail("您已审核通过，无需重复提交");
}
PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
@@ -373,7 +375,7 @@
@ApiOperation(value = "党员认证查询")
@GetMapping("partybuildingembercertification")
public R partybuildingembercertification() {
- //totest 党员认证查询
+ //党员认证查询
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
return partyBuildingService.userCertification(userId);
--
Gitblit v1.7.1