From 7ff83c61a3dd3c0cbcb2b493941b03c0b375e281 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 20 八月 2024 19:54:29 +0800
Subject: [PATCH] 修改保洁收纳分享bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index 194fad3..ab4f6e0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -41,25 +41,19 @@
private ZfClanService zfClanService;
@Resource
- private ZfClanManageService zfClanManageService;
+ private ZfAncestorService zfAncestorService;
private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfClan::getClanId);
- lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
- .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
- .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
- .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
+ lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
return lqw;
}
private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
- lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
- lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
- lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
return lqw;
}
@@ -80,30 +74,30 @@
@Override
public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
- List<ZfClan> beanRecords = list(lqw);
- List<ZfClanDate> zfClanDates=new ArrayList<>();
- System.out.println(beanRecords);
- for (ZfClan zfClan1: beanRecords) {
- ZfClanDate zfClanDate = new ZfClanDate();
- HashMap<Integer,String> adminName = new HashMap<>();
- adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
- zfClanDate.setAdminName(adminName);
- HashMap<Integer,String> momName = new HashMap<>();
- momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
- zfClanDate.setMomName(momName);
- HashMap<Integer,String> dadName = new HashMap<>();
- dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
- zfClanDate.setDadName(dadName);
- zfClanDate.setClanId(zfClan1.getClanId());
- zfClanDate.setClanName(zfClan1.getClanName());
- zfClanDates.add(zfClanDate);
+ Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
+ Page<ZfClan> pageResult = page(zfClanPage, lqw);
+
+ List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+// System.out.println(beanRecords);
+
+
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data); }
+
+ @Override
+ public AjaxResult selectDataList(ZfClan zfClan){
+ LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
+ List<ZfClan> zfClans = list(lqw);
+ List<ZfClan> satisfyList = new ArrayList<>();
+ for (ZfClan zfClan1: zfClans) {
+ if (zfAncestorService.count(zfClan1.getClanId())){
+ satisfyList.add(zfClan1);}
}
-
- return AjaxResult.success(zfClanDates);
-
-}
+ return AjaxResult.success(satisfyList);
+ }
@Override
public AjaxResult addData(ZfClan zfClan) {
@@ -131,10 +125,7 @@
// esModel.setFid(familyId);
esSer.insertTable(esModel);
// System.out.println(esModel);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
-// if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);
+
return AjaxResult.success();
} else {
@@ -199,7 +190,7 @@
public AjaxResult deleteData(Long ids) {
List<ZfClan> zfClans = listByIds(Arrays.asList(ids));
- zfClanManageService.deleteMember(ids);
+ zfAncestorService.deleteMember(ids);
if (zfClanService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -216,6 +207,7 @@
});
+
return AjaxResult.success();
} else {
return AjaxResult.error();
--
Gitblit v1.9.1