From 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:03:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index ba8087f..36d5508 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -212,7 +212,7 @@
         if (StrUtil.isNotBlank(msg)) {
             String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
             if (StrUtil.isNotBlank(result)) {
-                return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+                return R.fail(501, "填写内容存在 " + result + " 违规信息");
             }
         }
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -317,7 +317,11 @@
     @ApiOperation(value = "查询当前用户党员信息")
     @GetMapping("/getPartyMember")
     public R getPartyMember(@RequestParam("type")Integer type){
-        return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        if (StrUtil.isEmpty(loginUserInfo.getPhone())){
+            return R.fail("请先实名认证");
+        }
+        return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
     }
     @ApiOperation(value = "查询报道单位详情")
     @GetMapping("/comPbCheckUnit/detailByPhone")

--
Gitblit v1.7.1