From ff7b9d9fc630abe94293386bdde54055c3160ce0 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 21:58:39 +0800
Subject: [PATCH] 不同家族可以有相同的家庭号了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..f4620d2 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
@@ -64,12 +64,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);
--
Gitblit v1.9.1