6.6-2

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleChannelFundConfigNewServiceImpl.java

@@ -162,8 +162,9 @@ public class FundModuleChannelFundConfigNewServiceImpl implements IFundModuleCha
         Map<String,Object> map = approvalLogService.getApprovalLogs(bizChannel,null,null,1,null,null,null,pageNum,pageSize,1);
         List<ApprovalLog> logs = (List<ApprovalLog>) map.get("list");
         List<Long> configIds = logs.stream().collect(ArrayList::new,(l,i)-> l.add(i.getAuditConfigId()),ArrayList::addAll);
-
-        return null;
+        List<FundModuleChannelFundConfigNew> channelFundConfigs = fundModuleChannelFundConfigNewRepository.getByIds(configIds);
+        map.replace("list",channelFundConfigs);
+        return map;
     }
 
     @Override

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleServiceImpl.java

@@ -141,7 +141,7 @@ public class FundModuleServiceImpl implements IFundModuleService{
 	@Override
 	public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize,Integer sortMode) {
 		Map<String, Object> result;
-		if (sortMode == 2){
+		if (sortMode != null && sortMode == 2){
 			result = fundModuleChannelFundConfigNewService.getChannelFundConfigsByChannelOrFundIdOrdered(bizChannel, fundId, pageNum, pageSize);
 		}else{
 			result = fundModuleChannelFundConfigNewService.getChannelFundConfigsByChannelOrFundId(bizChannel, fundId, pageNum, pageSize);

src/main/java/com/quantgroup/asset/distribution/service/jpa/repository/IFundModuleChannelFundConfigNewRepository.java

@@ -38,4 +38,6 @@ public interface IFundModuleChannelFundConfigNewRepository extends JpaRepository
 
     @Query(value = "select biz_channel from fund_module_channel_fund_config_new where enable = 1", nativeQuery = true)
     public List<String> getAllBizChannel();
+    @Query(value = "SELECT * FROM fund_module_channel_fund_config_new where id in ?1 order by field(?1)",nativeQuery = true)
+    List<FundModuleChannelFundConfigNew> getByIds(List<Long> ids);
 }