From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 10:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 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 af92718..40ef5ab 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
@@ -91,6 +91,34 @@
return list(lqw);
}
+
+// public List<ZInfoUser> selectByNickName(String nickName){
+// ZInfoUser zInfoUser = new ZInfoUser();
+// zInfoUser.setNickName(nickName);
+// LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+// return list(lqw);
+// }
+
+ @Override
+ public AjaxResult findInfoUserNameAClan(String nickName)
+ {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setNickName(nickName);
+
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ List<ZInfoUser> zInfoUsers = list(lqw);
+ List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
+ for (ZInfoUser zInfoUser1: zInfoUsers) {
+ ShareOtherClan shareOtherClan = new ShareOtherClan();
+ shareOtherClan.setNickName(zInfoUser1.getNickName());
+ shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
+ shareOtherClan.setClanId(zInfoUser1.getClanId());
+ shareOtherClans.add(shareOtherClan);
+ }
+ return AjaxResult.success(shareOtherClans);
+ }
+
@Override
public ZInfoUser getInfoBysysId(Long sysid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
@@ -678,28 +706,25 @@
ZInfoUser user = getInfoBysysId(userId);
- if(user!=null)
- {
- Long familyId = user.getFamilyId();
- // System.out.println("dddddddddddddddddddd");
- if(user.getRoleId()==null)
- user.setRoleId(3L);
- String roleName = zfRoleService.getById(user.getRoleId()).getName();
-
- user.setRoleName(roleName);
-// System.out.println("dddddddddddddddddddd");
-// System.out.println(familyId);
-// if(familyId!=null&&familyId!=-1)
-// {
-// String familyName = zfFamilyService.getById(familyId).getName();
-// user.setFamilyName(familyName);
-// }
- }
- else{
- //鏌ヨsys_user琛�
-
+ if(user==null) {
+ //鍒╃敤userId鏌ヨ
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getUserId, userId);
+ List<ZInfoUser> list = list(lqw);
+ if(list.size()>0)
+ user = list.get(0);
+ else
+ return null;
}
+
+ Long familyId = user.getFamilyId();
+ // System.out.println("dddddddddddddddddddd");
+ if(user.getRoleId()==null)
+ user.setRoleId(3L);
+ String roleName = zfRoleService.getById(user.getRoleId()).getName();
+
+ user.setRoleName(roleName);
return user;
}
--
Gitblit v1.9.1