|
|
@@ -1,6 +1,7 @@
|
|
|
package com.ruoyi.system.controller;
|
|
|
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -81,6 +82,15 @@ public class PosAppealController extends BaseController
|
|
|
query.eq(PosAppeal::getUserId,uid);
|
|
|
query.eq(!StrUtil.isEmpty(ddId),PosAppeal::getDdId,ddId);
|
|
|
IPage<PosAppeal> result= posAppealService.page(pageInput,query);
|
|
|
+ if(!result.getRecords().isEmpty()){
|
|
|
+ List<String>ddIds= result.getRecords().stream().map(PosAppeal::getDdId).collect(Collectors.toList());
|
|
|
+ List<PosAppeal> child= posAppealService.list(new LambdaQueryWrapper<PosAppeal>().in(PosAppeal::getDdId,ddIds).eq(PosAppeal::getUserId,0L).orderByDesc(PosAppeal::getId));
|
|
|
+ for (PosAppeal data:result.getRecords()){
|
|
|
+ var sub= child.stream().filter(x-> data.getDdId().equals(x.getDdId())).toList();
|
|
|
+ data.setChild(sub);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return success(result);
|
|
|
}
|
|
|
|
|
|
@@ -129,6 +139,7 @@ public class PosAppealController extends BaseController
|
|
|
@PostMapping
|
|
|
public AjaxResult add(@RequestBody PosAppeal posAppeal)
|
|
|
{
|
|
|
+ posAppeal.setUserId(0L);
|
|
|
return toAjax(posAppealService.insertPosAppeal(posAppeal));
|
|
|
}
|
|
|
|