完成会员模块的权限处理

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/member/dao/MemberMapper.java

@@ -1,8 +1,14 @@
 package com.github.zuihou.business.member.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.member.entity.Member;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -17,4 +23,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface MemberMapper extends SuperMapper<Member> {
 
+    IPage<Member> pageList(IPage<Member> page, @Param(Constants.WRAPPER) LbqWrapper<Member> wrapper, DataScope dataScope);
 }

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/member/service/MemberService.java

@@ -1,7 +1,11 @@
 package com.github.zuihou.business.member.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.member.entity.Member;
+import com.github.zuihou.business.order.entity.Order;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 
 /**
  * <p>
@@ -14,4 +18,5 @@ import com.github.zuihou.business.member.entity.Member;
  */
 public interface MemberService extends SuperService<Member> {
 
+    IPage<Member> pageList(IPage<Member> page, LbqWrapper<Member> wrapper);
 }

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/member/service/impl/MemberServiceImpl.java

@@ -1,11 +1,15 @@
 package com.github.zuihou.business.member.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.business.member.dao.MemberMapper;
 import com.github.zuihou.business.member.entity.Member;
 import com.github.zuihou.business.member.service.MemberService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -22,4 +26,8 @@ import org.springframework.stereotype.Service;
 @Service
 
 public class MemberServiceImpl extends SuperServiceImpl<MemberMapper, Member> implements MemberService {
+    @Override
+    public IPage<Member> pageList(IPage<Member> page, LbqWrapper<Member> wrapper) {
+        return baseMapper.pageList(page, wrapper, new DataScope());
+    }
 }

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/member/MemberMapper.xml

@@ -26,7 +26,15 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        member_name, member_head, member_phone, member_group_id, member_gender, member_third_account, member_balance, member_point, member_source, member_company_id, member_birth, member_status
+        member_name, member_head, member_phone, member_group_id, member_gender, member_third_account, member_balance, member_point, member_source, member_company_id, member_birth, member_status, org_id
     </sql>
 
+    <select id="pageList" resultMap="BaseResultMap" parameterType="String">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+           select m.*, m.member_company_id as org_id from bt_member m
+        ) s ${ew.customSqlSegment}
+    </select>
+
 </mapper>

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/member/MemberController.java

@@ -1,5 +1,8 @@
 package com.github.zuihou.business.controller.member;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.member.entity.Member;
 import com.github.zuihou.business.member.dto.MemberSaveDTO;
 import com.github.zuihou.business.member.dto.MemberUpdateDTO;
@@ -10,6 +13,10 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.R;
+import com.github.zuihou.business.order.dto.OrderPageDTO;
+import com.github.zuihou.business.order.entity.Order;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -50,4 +57,14 @@ public class MemberController extends SuperController<MemberService, Long, Membe
 
         return R.success(baseService.saveBatch(memberList));
     }
+
+    @Override
+    public void query(PageParams<MemberPageDTO> params, IPage<Member> page, Long defSize) {
+        MemberPageDTO data = params.getModel();
+        Member model = BeanUtil.toBean(data, Member.class);
+        QueryWrap<Member> wrap = this.handlerWrapper(null, params);
+        LbqWrapper<Member> wrapper = wrap.lambda();
+        wrapper.like(Member::getMemberName, model.getMemberName()).like(Member::getMemberPhone, model.getMemberPhone()).eq(Member::getMemberStatus, model.getMemberStatus()).orderByDesc(Member::getCreateTime);
+        baseService.pageList(page, wrapper);
+    }
 }