From f187a18930a5d6326b5dc3972fd1395611fc5f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 17 三月 2024 17:18:41 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 589242c..b1f536c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -184,7 +184,13 @@
     public void roleAuthById(Integer id) {
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Member member = memberMapper.selectById(id);
-
+        if(member.getIsdeleted().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍛樺伐淇℃伅宸插垹闄�");
+        }
+        if(!member.getType().equals(Constants.memberType.internal)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
+        }
+        memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
 
 
 
@@ -387,12 +393,19 @@
 
     @Override
     public List<Member> findList(Member member) {
-        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
-        if(null != member.getType()) {
-            wrapper.lambda().eq(Member::getType,member.getType());
-        }
-        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
-        return memberMapper.selectList(wrapper);
+        return memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+                .selectAll(Member.class)
+                .selectAs(Company::getName,Member::getCompanyName)
+                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+                .eq(Objects.isNull(member.getType()),Member::getType,member.getType())
+                .eq(Member::getIsdeleted,Constants.ZERO)
+        );
+//        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+//        if(null != member.getType()) {
+//            wrapper.lambda().eq(Member::getType,member.getType());
+//        }
+//        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
+//        return memberMapper.selectList(wrapper);
     }
 
     @Override

--
Gitblit v1.9.3