From 3cea15af53d4eb5fb9ccdd1b7a31ec494ba41d6c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 09:37:28 +0800
Subject: [PATCH] 代码初始化

---
 server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 051b031..33954ea 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -208,7 +208,15 @@
             queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"'  and cm.member_id=t.id");
         }
         queryWrapper.orderByAsc(Member::getCreateDate);
-        return PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
+        PageData<Member> record =  PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
+        if(record!=null && record.getRecords()!=null){
+            for(Member m : record.getRecords()){
+                if(StringUtils.isNotBlank(m.getCompanyName())){
+                    m.setCompanyNameList(m.getCompanyName().split(","));
+                }
+            }
+        }
+        return  record;
     }
 
     @Override
@@ -278,7 +286,7 @@
                         if(StringUtils.isNotBlank(comNames)){
                             comNames += ",";
                         }
-                        comNames += c.getName();
+                        comNames += c.getNamePath();
                     }
                 }
                 cm.setCompanyList(qycom);
@@ -410,17 +418,18 @@
         }
         String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
         //鏍规嵁code鎹㈠尯浼佷笟寰俊ID
-        QywxBaseResponse<String> qwIdBaseResponse=  QywxUtil.getUserInfoByCode(token,dto.getCode());
-        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
-        }
-        if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
-        }
-        if(Objects.isNull(qwIdBaseResponse.getData())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙f瀽澶辫触锛岃鑱旂郴绠$悊鍛�");
-        }
-        String qwId = qwIdBaseResponse.getData();
+        QywxBaseResponse<String> qwIdBaseResponse= null;// QywxUtil.getUserInfoByCode(token,dto.getCode());
+//        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
+//        }
+//        if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
+//        }
+//        if(Objects.isNull(qwIdBaseResponse.getData())){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙f瀽澶辫触锛岃鑱旂郴绠$悊鍛�");
+//        }
+//        String qwId = qwIdBaseResponse.getData();
+        String qwId = dto.getCode();
         Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
         if(Objects.isNull(member)){
             //鏍规嵁浼佷笟寰俊ID 鏌ヨ鐢ㄦ埛淇℃伅

--
Gitblit v1.9.3