修改权限相关

feige

2024-08-22 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java

@@ -41,25 +41,19 @@
    private ZfClanService zfClanService;

    @Resource
    private ZfClanManageService zfClanManageService;
    private ZfAncestorService zfAncestorService;


    private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfClan::getClanId);
        lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
                .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
                .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
                .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
        lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
        return lqw;
    }

    private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
        lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
        lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
        lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
        lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
        return lqw;
    }

@@ -80,36 +74,47 @@
    @Override
    public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
        List<ZfClan> beanRecords = list(lqw);

        List<ZfClanDate> zfClanDates=new ArrayList<>();

        System.out.println(beanRecords);
        for (ZfClan zfClan1: beanRecords) {
            ZfClanDate zfClanDate = new ZfClanDate();
            HashMap<Integer,String> adminName = new HashMap<>();
            adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
            zfClanDate.setAdminName(adminName);
            HashMap<Integer,String> momName = new HashMap<>();
            momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
            zfClanDate.setMomName(momName);
            HashMap<Integer,String> dadName = new HashMap<>();
            dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
            zfClanDate.setDadName(dadName);
            zfClanDate.setClanId(zfClan1.getClanId());
            zfClanDate.setClanName(zfClan1.getClanName());
            zfClanDates.add(zfClanDate);
        Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
        Page<ZfClan> pageResult = page(zfClanPage, lqw);

        List<ZfClan> beanRecords = pageResult.getRecords();//得到查询出来的数据

        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
        return AjaxResult.success(data);    }

    @Override
    public AjaxResult selectData() {
        List<ZfClan> lis = this.list();
        return AjaxResult.success(lis);
    }

    @Override
    public AjaxResult selectDataList(ZfClan zfClan){
        LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
        List<ZfClan> zfClans = list(lqw);
        List<ZfClan>  satisfyList = new ArrayList<>();
        for (ZfClan zfClan1: zfClans) {
            if (zfAncestorService.count(zfClan1.getClanId())){
               satisfyList.add(zfClan1);}
        }
        return AjaxResult.success(satisfyList);
    }

        return AjaxResult.success(zfClanDates);
    @Override
    public List<ZfClan> selectByCondition(ZfClan zfClan) {

}

        LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
        List<ZfClan> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }

    @Override
    public AjaxResult addData(ZfClan zfClan) {
        LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
        List<ZfClan> list = list(lqw);


        if(list.size()>0){
            throw new RuntimeException("请勿新增重复家族");
@@ -131,10 +136,7 @@
//            esModel.setFid(familyId);
            esSer.insertTable(esModel);
//            System.out.println(esModel);
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
//            if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);


            return AjaxResult.success();
        } else {
@@ -154,7 +156,7 @@
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("家族");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
//        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);
//        System.out.println("===================================="+meeting);
        if(updateById(zfClan)){
@@ -199,7 +201,7 @@
    public AjaxResult deleteData(Long ids) {
        List<ZfClan> zfClans = listByIds(Arrays.asList(ids));

        zfClanManageService.deleteMember(ids);
        zfAncestorService.deleteMember(ids);
        if (zfClanService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
@@ -216,6 +218,7 @@
            });



            return AjaxResult.success();
        } else {
            return AjaxResult.error();