From 7839b4c5471c1cd48cd1db87346448c26b11912a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 12 九月 2024 16:34:31 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 32 ++++++++++++++++----------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java | 6 ++++--
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
index 8f408d3..aaaaa1b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
@@ -27,12 +27,14 @@
TravelDetailService travelDetailService;
@GetMapping("/{cid}")
- public AjaxResult getDataByCid(@PathParam("cid") Long cid,TravelDetail travelDetail){
+ public AjaxResult getDataByCid(@PathVariable("cid") Long cid,TravelDetail travelDetail){
+ System.out.println(cid);
+ System.out.println("-----------------------------------");
List<TravelDetail> travelDetailList = travelDetailService.getDataByCid(cid,travelDetail);
return AjaxResult.success(travelDetailList);
}
- @GetMapping("/{id}")
+ @GetMapping("/byId/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(travelDetailService.getById(id));
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index dca8db9..af92718 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -423,8 +423,8 @@
// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
List<ZInfoUser> allPeopleList = list(lqw);
- System.out.println(allPeopleList);
- System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
+ // System.out.println(allPeopleList);
+ //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
@@ -441,7 +441,7 @@
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
- System.out.println(result);
+ // System.out.println(result);
// result.stream().map(
// data->{
@@ -488,7 +488,7 @@
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
// System.out.println(userList);
- System.out.println("---------------");
+ // System.out.println("---------------");
List<Genealogy> allData = userList.stream().map(
zInfoUser -> {
Genealogy newGenealogy = new Genealogy();
@@ -508,8 +508,8 @@
return newGenealogy;
}
).collect(Collectors.toList());
- System.out.println(allData);
- System.out.println("999999999988888888888++++++++++++++++++++++");
+ // System.out.println(allData);
+ // System.out.println("999999999988888888888++++++++++++++++++++++");
List<Genealogy> collect = allData.stream()
.distinct()
.filter((data)-> data.getIsMyFamily() == 1)
@@ -523,8 +523,8 @@
}
resultData.add(collect.get(i));
}
- System.out.println(resultData);
- System.out.println("999999999988888888888++++++++++++++++++++++");
+ // System.out.println(resultData);
+ // System.out.println("999999999988888888888++++++++++++++++++++++");
//
//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
@@ -575,9 +575,9 @@
}
}
- System.out.println(resultData);
+ // System.out.println(resultData);
- System.out.println("================++++++++++++++66666666666666666999999999");
+ // System.out.println("================++++++++++++++66666666666666666999999999");
// for (Genealogy data : resultData) {
@@ -847,7 +847,7 @@
// if(depth==layer)
// layer = layer + 1;
- System.out.println(depth);
+ // System.out.println(depth);
// List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter(
// one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1)
@@ -858,8 +858,8 @@
one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1))
).map(
one -> {
- System.out.println("++++++++++----0009999");
- System.out.println(one);
+ // System.out.println("++++++++++----0009999");
+ // System.out.println(one);
if (depth == 0) {
one.setIdentity(people.getIdentity() + 1);
//鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥�
@@ -885,14 +885,14 @@
}
List<ZInfoUser> zinfo = fillChildren(one, allPeopleList, depth - 1);
one.setChildList(zinfo);
- System.out.println(one);
+ // System.out.println(one);
return one;
}
//return one;
}
).collect(Collectors.toList());
- System.out.println(collect);
+ // System.out.println(collect);
return collect;
}
@@ -910,7 +910,7 @@
// if(depth==layer)
// layer = layer + 1;
- System.out.println(depth);
+ // System.out.println(depth);
List<ZInfoUser> collect = allPeopleList.stream().filter(
one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId())
).map(
--
Gitblit v1.9.1