From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 25 十月 2024 23:11:30 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 f4620d2..b7f90d1 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);
}
@@ -276,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);
}
@@ -340,9 +350,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