From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java
index 91bd22b..e28ff97 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java
@@ -5,10 +5,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.domain.ZAuthority;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfCode;
-import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.AuthorityDto;
import com.ruoyi.domain.dto.AuthorityDto2;
import com.ruoyi.domain.dto.AuthorityDtoWithName;
@@ -53,9 +51,9 @@
public List<ZAuthority> getAuthority() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
-
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
LambdaQueryWrapper<ZAuthority> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZAuthority::getUid,userId);
+ lqw.eq(ZAuthority::getUid,zInfoUser.getUserId());
return list(lqw);
}
@@ -64,12 +62,13 @@
public AuthorityDto getByCondition(AuthorityDto authorityDto) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
-
+ Integer clanId = user.getClanId();
String familyName = authorityDto.getFamilyName();
String modelName = authorityDto.getModelName();
//鏍规嵁瀹跺涵鐨勫悕瀛楁煡鍑哄搴殑id
- Long familyId = zfFamilyService.getByName(familyName).getId();
+ // Integer clanId = 0;
+ Long familyId = zfFamilyService.getByName(familyName, clanId).getId();
//鏍规嵁妯″潡鐨勫悕瀛楁煡鍑哄搴旂殑鏉冮檺鐮�
List<ZfCode> zfCodeList = zfCodeService.likeGetByName(modelName);
@@ -275,12 +274,24 @@
return AjaxResult.success(returnData);
}
+ private LambdaQueryWrapper<ZAuthority> uniqueCondition(ZAuthority zAuthority) {
+ LambdaQueryWrapper<ZAuthority> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zAuthority.getUid()!=null,ZAuthority::getUid,zAuthority.getUid());
+ lqw.eq(zAuthority.getFid()!=null,ZAuthority::getFid,zAuthority.getFid());
+ lqw.eq(zAuthority.getAuthority()!=null,ZAuthority::getAuthority,zAuthority.getAuthority());
+
+ return lqw;
+ }
public void addData(ZAuthority za)
{
//鍒ゆ柇鏄惁閲嶅鎺堟潈
-
+ LambdaQueryWrapper<ZAuthority> lqw = uniqueCondition(za);
+ List<ZAuthority> list = list(lqw);
//
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
zAuthorityService.save(za);
}
@@ -297,6 +308,7 @@
za.setFid(zAuthority.getFid());
za.setUid(uid);
addData(za);
+ System.out.println(za);
}
// Long []
// if(bl)
@@ -318,7 +330,7 @@
lqw.eq(ZAuthority::getFid,empowerDto.getFid())
.eq(ZAuthority::getAuthority, auri)
.eq(ZAuthority::getUid, uid);
-
+ System.out.println("11111111111111111111"+list(lqw));
zAuthorityService.remove(lqw);
// addData(za);
}
@@ -339,9 +351,12 @@
LambdaQueryWrapper<ZInfoUser> lq = new LambdaQueryWrapper<>();
- lq.in(ZInfoUser::getUserId, allUserListId);
+ List<ZInfoUser> userInfo = new ArrayList<>();
+ if(allUserListId.size()!=0) {
+ lq.in(ZInfoUser::getUserId, allUserListId);
- List<ZInfoUser> userInfo = zInfoUserService.list(lq);
+ userInfo = zInfoUserService.list(lq);
+ }
// Map<Long, String> usi = userInfo.stream().collect(Collectors.toMap(ZInfoUser::getUserId,ZInfoUser::getNickName));
return AjaxResult.success(userInfo);
}
--
Gitblit v1.9.1