BUG修复

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/CustomerBusinessContoller.java

@@ -229,7 +229,7 @@ public class CustomerBusinessContoller {
             wrapper.last("limit " + limit);
             return new R<>(tSettleDomainService.list(wrapper));
         }else{
-            return new R<>(tSettleDomainService.getOwnSettleDomainNoPage(user.getId().toString(),settleName));
+            return new R<>(tSettleDomainService.getOwnSettleDomainNoPage(user.getId(),settleName));
         }
     }
 
@@ -268,9 +268,6 @@ public class CustomerBusinessContoller {
 		if(null == user){
 			return R.failed("非法用户！");
 		}
-		if (Common.isEmpty(user.getSettleIdList())){
-			return R.ok();
-		}
-        return  tSettleDomainService.getCustomerOwnerPage(page,customerName,user.getSettleIdList());
+        return  tSettleDomainService.getCustomerOwnerPage(page,customerName,user.getId());
     }
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -91,5 +91,5 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	IPage<CustomerOwnerSelectVo> getCustomerOwnerPage(Page page,
 													  @Param("customerName")String customerName,
-													  @Param("settleIdList")List<String> settleIdList);
+													  @Param("userId")String userId);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -121,5 +121,5 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 
 	List<TCustomerInfo> getTCustomerInfoForB(List<String> customerList);
 
-	R<IPage<CustomerOwnerSelectVo>> getCustomerOwnerPage(Page<CustomerOwnerSelectVo> page, String customerName, List<String> settleIdList);
+	R<IPage<CustomerOwnerSelectVo>> getCustomerOwnerPage(Page<CustomerOwnerSelectVo> page, String customerName, String userId);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -468,7 +468,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 
 	@Override
 	public R<IPage<CustomerOwnerSelectVo>> getCustomerOwnerPage(Page<CustomerOwnerSelectVo> page, String customerName,
-																List<String> settleIdList) {
-		return R.ok(baseMapper.getCustomerOwnerPage(page,customerName,settleIdList));
+																String userId) {
+		return R.ok(baseMapper.getCustomerOwnerPage(page,customerName,userId));
 	}
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -426,6 +426,7 @@
 				#{item}
 			</foreach>
 		</if>
+		and a.id in (select b.settle_id from m_setttle_customer_user b where b.user_id = #{userId}) and  a.DELETE_FLAG = '0'
 		group  by a.CUSTOMER_NO order by CREATE_TIME desc
 	</select>
 </mapper>