From ee02f5032743f3c0bd217cb6cf8ba03ee663c629 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:16:31 +0800
Subject: [PATCH] 修改PeopleSea.java文件
---
zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java | 18 ++++++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 16 ++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 10 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 29 ++++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java | 2 +
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 2 +
6 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 693857b..e7a7fd6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -75,6 +75,35 @@
/**
+ * 鏍规嵁鐢ㄦ埛鐨刬d鏌ヨ鍙﹀涓�涓鏃忕殑鍏ㄩ儴鎴愬憳淇℃伅
+ *
+ */
+ @GetMapping("/getAnotherFamInfo/{userId}")
+ public AjaxResult getAnotherFamInfo(@PathVariable("userId") Long userId)
+ {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ System.out.println(userId);
+ List<ZInfoUser> zInfoUsers = zInfoUserService.selectByCondition(zInfoUser);
+ if(!zInfoUsers.isEmpty())
+ {
+
+ ZInfoUser zi = new ZInfoUser();
+ zi.setUaid(zInfoUsers.get(0).getUaid());
+ zi.setSysId(userId);
+
+ ZInfoUser zss = zInfoUserService.selectByUaidAndUid(zi);
+
+ return zInfoUserService.listAllFamilyPeople(zss.getClanId());
+ // return AjaxResult.success("鏌ヨ鎴愬姛",zss);
+ }
+ else
+ {
+ return AjaxResult.success("娌℃湁鍙﹀鐨勫鏃忎俊鎭�", null);
+ }
+ }
+
+ /**
* 瀵煎嚭涓汉璇︾粏淇℃伅璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index db6db7c..3587dcd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -121,6 +121,16 @@
private Integer clanId;
+ private String uaid;
+
+ public String getUaid() {
+ return uaid;
+ }
+
+ public void setUaid(String uaid) {
+ this.uaid = uaid;
+ }
+
public void setClanId(Integer clanId) {
this.clanId = clanId;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java b/zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java
index 0a8fc7d..d0f6ccd 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/PeopleSea.java
@@ -14,4 +14,6 @@
private String peoples;
private String hasAttachment;
+
+ private String isHIde;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 018e0f4..2a2514e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -46,6 +46,8 @@
// AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
+
+ ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser);
AjaxResult removeByUserName(List<String> userName);
List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
index f59026c..eb9b60a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.domain.PeopleSea;
@@ -62,14 +63,21 @@
for (String pe : pes) {
lqw.like(ZfEvent::getPeople, pe);
}
+ peopleS.setIsHIde("鍚�");
+ lqw.eq(!StringUtils.isEmpty(peopleS.getIsHIde()), ZfEvent::getIsHide, "鍚�");
+
lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
- if(peopleS.getHasAttachment().equals("鏄�"))
+ if(peopleS.getHasAttachment()!=null&&peopleS.getHasAttachment().equals("鏄�"))
{
- lqw.isNotNull(ZfEvent::getUrl);
+ System.out.println("not null!");
+ lqw.isNotNull(ZfEvent::getUrl).and(r->r.apply("url!=''"));
+ }else
+ {
+ lqw.eq(!StringUtils.isEmpty(peopleS.getHasAttachment()), ZfEvent::getUrl, "");
+
}
-
-
- Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
+ // if(peopleS.getIsHIde()!=null)
+ Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);
List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
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 9e60ac8..ca4fbae 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
@@ -231,6 +231,7 @@
private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());
lqw.eq(zInfoUser.getUserId() != null, ZInfoUser::getUserId, zInfoUser.getUserId());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysAddress()), ZInfoUser::getAlwaysAddress, zInfoUser.getAlwaysAddress());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysPolice()), ZInfoUser::getAlwaysPolice, zInfoUser.getAlwaysPolice());
@@ -266,6 +267,21 @@
}
@Override
+ public ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser) {
+ LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ System.out.println(zInfoUser.getUserId());
+ System.out.println(zInfoUser.getUaid());
+ lambdaQueryWrapper.eq(!StringUtils.isEmpty(zInfoUser.getUaid()), ZInfoUser::getUaid, zInfoUser.getUaid())
+ .ne(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());
+
+ List<ZInfoUser> lis = list(lambdaQueryWrapper);
+ if(!lis.isEmpty())
+ return lis.get(0);
+ else
+ return null;
+ }
+
+ @Override
public AjaxResult removeByUserName(List<String> userName) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
--
Gitblit v1.9.1