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/ZfFamilyServiceImpl.java | 3 ++-
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java | 5 +++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 6 +++---
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 5e766e5..081ad8d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -51,9 +51,9 @@
public AjaxResult getByFId(@PathVariable("fid") Long fid){
return AjaxResult.success(zfFamilyService.getByFid(fid));
}
- @GetMapping("/findByFname/{name}")
- public AjaxResult getByFName(@PathVariable("name") String name){
- return AjaxResult.success(zfFamilyService.getByName(name));
+ @GetMapping("/findByFname/{name}/{clanId}")
+ public AjaxResult getByFName(@PathVariable("name") String name, @PathVariable("clanId") Integer clanId){
+ return AjaxResult.success(zfFamilyService.getByName(name, clanId));
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
index 00a43e0..b0d755d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -24,7 +24,7 @@
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
- ZfFamily getByName(String familyName);
+ ZfFamily getByName(String familyName, Integer clanId);
ZfFamily getByFid(Long fid);
ZfFamily getByFamId(Long fid);
List<UserInfoDto> getByFamilyId(Long fid);
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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
index 30d1aab..c3815c2 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
@@ -69,9 +69,10 @@
}
@Override
- public ZfFamily getByName(String familyName) {
+ public ZfFamily getByName(String familyName, Integer clanId) {
LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfFamily::getName,familyName);
+ lqw.eq(ZfFamily::getClanId, clanId);
return getOne(lqw);
}
--
Gitblit v1.9.1