Merge branch 'saff_update_feature' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -127,24 +127,29 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
     public PageDataVO<AppShareholderDetailVo> findWithPage(AppShareholderDetailFindDTO appShareholderDetailFindDTO) {
 
         PageDataVO<AppShareholderDetailVo> dataVO = new PageDataVO<>();
-        Example example = new Example(AppShareholderDetail.class);
-        Example.Criteria criteria = example.createCriteria();
-
+        String name = null;
+        String phone = null;
+        Integer positionId = null;
+        Integer companyID = null;
         if (StringUtils.isNotEmpty(appShareholderDetailFindDTO.getName())) {
-            criteria.andLike("name", String.format("%%%s%%", appShareholderDetailFindDTO.getName().trim()));
+            name = String.format("%%%s%%", appShareholderDetailFindDTO.getName().trim());
         }
         if (StringUtils.isNotEmpty(appShareholderDetailFindDTO.getPhone())) {
-            criteria.andEqualTo("phone", appShareholderDetailFindDTO.getPhone());
+            phone = appShareholderDetailFindDTO.getPhone();
         }
         if (Objects.nonNull(appShareholderDetailFindDTO.getCompanyId())) {
-            criteria.andEqualTo("companyId", appShareholderDetailFindDTO.getCompanyId());
+            companyID = appShareholderDetailFindDTO.getCompanyId();
         }
         if (Objects.nonNull(appShareholderDetailFindDTO.getPositionId())) {
-            criteria.andEqualTo("positionId", appShareholderDetailFindDTO.getPositionId());
+            positionId = appShareholderDetailFindDTO.getPositionId();
         }
-        List<AppShareholderDetail> list = mapper.selectByExample(example);
-        example.setOrderByClause("upd_time desc");
-        PageDataVO<AppShareholderDetail> pageDataVO = PageDataVO.pageInfo(appShareholderDetailFindDTO.getPage(), appShareholderDetailFindDTO.getLimit(), () -> mapper.selectByExample(example));
+        Integer finalPositionId = positionId;
+        Integer finalCompanyID = companyID;
+        String finalPhone = phone;
+        String finalName = name;
+        PageDataVO<AppShareholderDetail> pageDataVO = PageDataVO.pageInfo(appShareholderDetailFindDTO.getPage(), appShareholderDetailFindDTO.getLimit(), () -> {
+            mapper.findPage(finalName, finalPhone, finalPositionId, finalCompanyID);
+        });
         List<AppShareholderDetail> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)) {
             dataVO.setData(Collections.EMPTY_LIST);
@@ -155,19 +160,19 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
 
         List<Integer> postionIds = data.stream().map(AppShareholderDetail::getPositionId).collect(Collectors.toList());
         Map<Integer, AppUserPosition> postionMap = appUserPositionBiz.findPostionIdAndPostionMapByIds(postionIds);
-        List<AppShareholderDetailVo> appShareholderDetailVos = new ArrayList<>();
-        List<AppShareholderDetailVo> appShareholderDetailMerge = new ArrayList<>();
+        List<AppShareholderDetailVo> AppShareholderDetailVos = new ArrayList<>();
+        //    List<AppShareholderDetailVo> AppShareholderDetailMerge = new ArrayList<>();
         AppShareholderDetailVo appShareholderDetailVo;
         for (AppShareholderDetail appShareholderDetail : data) {
             appShareholderDetailVo = new AppShareholderDetailVo();
             BeanUtils.copyProperties(appShareholderDetail, appShareholderDetailVo);
             String postionName = postionMap == null ? "" : postionMap.get(appShareholderDetail.getPositionId()) == null ? "" : postionMap.get(appShareholderDetail.getPositionId()).getName();
             appShareholderDetailVo.setPositionName(postionName);
-            appShareholderDetailVos.add(appShareholderDetailVo);
+            AppShareholderDetailVos.add(appShareholderDetailVo);
         }
-        for (AppShareholderDetailVo appShareholderDetailVoOld : appShareholderDetailVos) {
+  /* for (AppShareholderDetailVo appShareholderDetailVoOld : AppShareholderDetailVos) {
             boolean flag = true;
-            for (AppShareholderDetailVo appShareholderDetailVoNew : appShareholderDetailMerge) {
+            for (AppShareholderDetailVo appShareholderDetailVoNew : AppShareholderDetailMerge) {
                 if (appShareholderDetailVoNew.getPhone().equals(appShareholderDetailVoOld.getPhone()) && appShareholderDetailVoNew.getIsQuit().equals(appShareholderDetailVoOld.getIsQuit())) {//判断姓名是否相同
                     appShareholderDetailVoNew.setCompanyName(appShareholderDetailVoNew.getCompanyName() + "," + appShareholderDetailVoOld.getCompanyName());
                     flag = false;
@@ -176,14 +181,11 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
             if (flag) {
                 appShareholderDetailMerge.add(appShareholderDetailVoOld);//给整合后集合添加子元素
             }
-        }
-
+        }*/
         dataVO.setPageSize(pageDataVO.getPageSize());
-        // dataVO.setPageSize(AppShareholderDetailMerge.size());
         dataVO.setPageNum(pageDataVO.getPageNum());
-        dataVO.setData(appShareholderDetailMerge);
-        dataVO.setTotalPage(pageDataVO.getTotalPage());
-        //  dataVO.setTotalCount(pageDataVO.getTotalCount());
+        dataVO.setData(AppShareholderDetailVos);
+        dataVO.setTotalCount(pageDataVO.getTotalCount());
         dataVO.setTotalPage(pageDataVO.getTotalPage());
         return dataVO;
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppShareholderDetailMapper.java

@@ -3,6 +3,9 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
 /**
  * @author zuoyihang
  * @version 1.0
@@ -13,4 +16,11 @@ public interface AppShareholderDetailMapper extends Mapper<AppShareholderDetail>
 
     Integer selectShareHolderByUserIdOrPhone(@Param("userId") Integer userId,
                                              @Param("phone") String phone);
+
+
+    List<AppShareholderDetail> findPage(@Param("name") String name,
+                                        @Param("phone") String phone,
+                                        @Param("positionId") Integer positionId,
+                                        @Param("companyId") Integer companyId);
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -28,13 +28,42 @@
             </otherwise>
         </choose>
     </select>
-    <select id="xx" resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
-		select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName` from  app_shareholder_detail where is_quit=0 and position_id=1 group by phone
+
+    <select id="findPage" resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
+
+        select * from (
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
+        `phone`,group_concat(company_name) as `companyName`,max(company_id) as `companyId` from app_shareholder_detail
+        where is_quit=0 and
+        position_id=1 group by phone
         union ALL
-        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=0 and position_id=2 group by phone
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
+        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        where is_quit=0 and
+        position_id=2 group by phone
         union ALL
-        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=1 and position_id	=1 group by phone
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
+        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        where is_quit=1 and position_id
+        =1 group by phone
         union all
-        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as `phone`,group_concat(company_name) as `companyName`  from  app_shareholder_detail where is_quit=1 and position_id	=2 group by phone
-	</select>
+        select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
+        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        where is_quit=1 and position_id
+        =2 group by phone
+        ) a
+        where 1=1
+        <if test="name !=null and name !='' ">
+            and a.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="positionId!=null">
+            and a.positionId=#{positionId}
+        </if>
+        <if test="phone!=null">
+            and a.phone=#{phone}
+        </if>
+        <if test="companyId!=null">
+            and a.companyId=#{companyId}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file