缴费记录bug修改

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java

@@ -52,6 +52,7 @@ public class IcPartyMemberPayRecordDetailController {
     @RequestMapping("page")
     public Result<PageData<IcPartyMemberPayRecordDetailDTO>> page(@LoginUser TokenDto tokenDto, @RequestParam Map<String, Object> params){
         params.put("customerId",tokenDto.getCustomerId());
+        params.put("userId",tokenDto.getUserId());
 //        PageData<IcPartyMemberPayRecordDetailDTO> page = icPartyMemberPayRecordDetailService.page(params);
         PageData<IcPartyMemberPayRecordDetailDTO> page = icPartyMemberPayRecordDetailService.getPhrasePage(params);
         return new Result<PageData<IcPartyMemberPayRecordDetailDTO>>().ok(page);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java

@@ -4,30 +4,29 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
+import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.modules.partymember.dao.IcPartyMemberPayRecordDetailDao;
 import com.epmet.modules.partymember.entity.IcPartyMemberPayRecordDetailEntity;
-import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity;
-import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.modules.partymember.redis.IcPartyMemberPayRecordDetailRedis;
 import com.epmet.modules.partymember.service.IcPartyMemberPayRecordDetailService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO;
-import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
-import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO;
-import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -42,6 +41,8 @@ public class IcPartyMemberPayRecordDetailServiceImpl extends BaseServiceImpl<IcP
 
     @Autowired
     private IcPartyMemberPayRecordDetailRedis icPartyMemberPayRecordDetailRedis;
+    @Resource
+    private IcPartyOrgDao icPartyOrgDao;
 
     @Override
     public PageData<IcPartyMemberPayRecordDetailDTO> page(Map<String, Object> params) {
@@ -59,6 +60,25 @@ public class IcPartyMemberPayRecordDetailServiceImpl extends BaseServiceImpl<IcP
      */
     @Override
     public PageData<IcPartyMemberPayRecordDetailDTO> getPhrasePage(Map<String, Object> params) {
+        String customerId = (String) params.get("customerId");
+        String userId = (String) params.get("userId");
+        String orgId = (String) params.get("orgId");
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+        if (null == staffInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取工作人员信息失败", "获取工作人员信息失败");
+        }
+        if (StringUtils.isBlank(orgId)) {
+            //获取工作人员所属组织同级的党组织
+            LambdaQueryWrapper<IcPartyOrgEntity> orgWrapper = new LambdaQueryWrapper<>();
+            orgWrapper.eq(IcPartyOrgEntity::getCustomerId, customerId);
+            orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId());
+            orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR);
+            IcPartyOrgEntity org = icPartyOrgDao.selectOne(orgWrapper);
+            if (null == org) {
+                return new PageData<>(Collections.emptyList(), 0);
+            }
+            params.put("orgId",org.getId());
+        }
         IPage<IcPartyMemberPayRecordDetailDTO> page = getPage(params);
         List<IcPartyMemberPayRecordDetailDTO> list = baseDao.selectListInfo(params);
         return new PageData<>(list, page.getTotal());

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml

@@ -33,6 +33,7 @@
         left join ic_party_org org on org.ID = pm.SSZB and org.DEL_FLAG = 0
         where prd.DEL_FLAG = 0
         and prd.CUSTOMER_ID = #{customerId}
+        AND (pm.SSZB = #{orgId} OR pm.ORG_PIDS LIKE concat('%', #{orgId}, '%'))
         <if test='name != "" and name != null'>
             and pm.NAME like concat('%',#{name},'%')
         </if>
@@ -42,9 +43,6 @@
         <if test='idCard != "" and idCard != null'>
             and pm.ID_CARD like concat('%',#{idCard},'%')
         </if>
-        <if test='orgId != "" and orgId != null'>
-            and FIND_IN_SET(#{orgId},pm.ORG_PIDS)
-        </if>
         <if test='year != "" and year != null'>
             and prd.YEAR = #{year}
         </if>