不同家族可以有相同的家庭号了

feige

2024-08-29 ff7b9d9fc630abe94293386bdde54055c3160ce0

不同家族可以有相同的家庭号了

 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));
    }



 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);

 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);

 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);
    }