From a5e8d4981a46450ce8cb33c1c96290b196f87d28 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 25 一月 2022 10:06:57 +0800
Subject: [PATCH] 多社区实名认证相关提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 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 8f796ac..fb240bf 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
@@ -635,7 +635,7 @@
      * @return 人员详情
      */
     @Override
-    public R detailUser(Long userId) {
+    public R<LoginUserInfoVO> detailUser(Long userId) {
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         if (userId < 100000000l) {
             SysUserDO sysUserDO = userDao.selectById(userId);
@@ -861,7 +861,7 @@
         }
         sysUserDO.setFaceState(null);
         SysUserDO sysUserDO1 =
-            userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
+            userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard).eq(SysUserDO::getCommunityId,loginUserInfoVO.getCommunityId()));
         if (!ObjectUtils.isEmpty(sysUserDO1)) {
             return R.fail("身份证已经存在");
         }
@@ -2869,12 +2869,8 @@
         } catch (Exception e) {
             e.printStackTrace();
             log.error("修改数字商业街商家用户报错【{}】", e.getMessage());
-            if (e.getMessage().contains("union_phone_type")) {
-                return R.fail("手机号已存在");
-            } else if (e.getMessage().contains("union_account_type")) {
+            if (e.getMessage().contains("union_account_type") || e.getMessage().contains("23000")) {
                 return R.fail("账户已经存在");
-            }else if(e.getMessage().contains("23000")){
-                return R.fail("手机号已存在");
             } else {
                 return R.fail("账户或手机号已存在,请重新填写尝试");
             }

--
Gitblit v1.7.1