From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
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 314d72a..0e898f9 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
@@ -75,11 +75,19 @@
ZInfoUser infu = this.getById(tfid);
if(infu==null)
return false;
- if(infu.getFatherId()!=null && uid==infu.getFatherId())
+ if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
return true;
- if(infu.getMomId()!=null && uid==infu.getMomId())
+ if(infu.getMomId()!=null && uid.equals(infu.getMomId()))
return true;
return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
+ }
+
+ @Override
+ public List<ZInfoUser> selectByClanId(Integer clanId) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setClanId(clanId);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ return list(lqw);
}
@Override
@@ -91,6 +99,15 @@
return list.get(0);
else
return null;
+ }
+
+
+ @Override
+ public List<ZInfoUser> getDataBySex(Integer sex){
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSex, sex);
+ List<ZInfoUser> list = list(lqw);
+ return list;
}
@Override
@@ -124,6 +141,7 @@
lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
return lqw;
}
@@ -334,9 +352,11 @@
* @return
*/
@Override
- public AjaxResult listWithTree(Integer depth) {
-
- List<ZInfoUser> allPeopleList = list();
+ public AjaxResult listWithTree(Integer depth, Integer clanId) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(clanId!=null, ZInfoUser::getClanId, clanId);
+ // List<ZfEvent> list = list(lqw);
+ List<ZInfoUser> allPeopleList = list(lqw);
List<ZInfoUser> result = null;
// try {
// result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
@@ -379,9 +399,9 @@
// System.out.println(people);
return people;
}).collect(Collectors.toList());
-
-System.out.println("--------------++++++++++++++++--------------");
-System.out.println(result);
+//
+//System.out.println("--------------++++++++++++++++--------------");
+//System.out.println(result);
return AjaxResult.success(result);
}
@@ -399,7 +419,7 @@
lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
// 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);
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
@@ -653,7 +673,7 @@
String roleName = zfRoleService.getById(user.getRoleId()).getName();
user.setRoleName(roleName);
- System.out.println("dddddddddddddddddddd");
+// System.out.println("dddddddddddddddddddd");
// System.out.println(familyId);
// if(familyId!=null&&familyId!=-1)
// {
@@ -699,7 +719,17 @@
public ZInfoUser getMyself() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return getById(userId);
+ // System.out.println(userId);
+ //System.out.println("-----------------++++++++9999++++++++++----------");
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId() != null, ZInfoUser::getSysId, zInfoUser.getSysId());
+ List<ZInfoUser> list = list(lqw);
+ if(!list.isEmpty())
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -751,13 +781,18 @@
}
@Override
- public AjaxResult listAllFamilyPeople() {
+ public AjaxResult listAllFamilyPeople(Integer clanId) {
// List<ZInfoUser> lis = list();
// for(ZInfoUser tm: lis)
// {
// System.out.println(tm.getRoleId());
// }
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> lis = list(zInfoUserLambdaQueryWrapper);
+ List<ZInfoUser> collect = lis.stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+
+
return AjaxResult.success(collect);
}
--
Gitblit v1.9.1