From e76eb20e6c3818e13a598b7f0f4d22a090832fd4 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期三, 13 十二月 2023 15:40:52 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java | 10 +++++++---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 07d58fd..641be3e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -131,7 +131,7 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
- // @RequiresPermissions("business:member:query")
+ @RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
index b758023..951d47b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -9,6 +9,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
@@ -16,13 +18,15 @@
public interface MemberMapper extends BaseMapper<Member> {
- @Select(" select m.* , c.name as companyName , d.name as roleName, " +
- " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount " +
+ @Select(" select m.* , c.name as companyName , " +
+ " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount, " +
+ " (select GROUP_CONCAT(dr.name) from member_role mr left join device_role dr on dr.id=mr.ROLE_ID " +
+ " where mr.MEMBER_ID=m.id and mr.ISDELETED=0 GROUP BY mr.MEMBER_ID) as roleName "+
" from member m " +
" left join company c on m.COMPANY_ID=c.id "+
- " left join device_role d on d.id=m.ROLE_ID "+
" ${ew.customSqlSegment} ")
IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
}
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 0ac6f16..0de6db9 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
@@ -451,6 +451,7 @@
.eq("m.ISDELETED",0)
.orderByDesc("m.CREATE_DATE")
);
+
return PageData.from(memberIPage);
}
--
Gitblit v1.9.3