多机构

ZQN

2024-06-24 b4b2b63345961884c8a9dd95ca1f32c0ea1123e5

多机构

 project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java

@@ -225,6 +225,13 @@
        return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
    }

    @ApiOperation("用户多机构——机构树")
    @GetMapping("/batchUserDeptTree")
    public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
    {
        return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
    }

    @ApiOperation("企业用户重置密码")
    @Log(title = "企业用户重置密码", businessType = BusinessType.UPDATE)
    @PostMapping("/resetCompanyUserPwd")

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/ComplaintResultBo.java

@@ -13,5 +13,6 @@
public class ComplaintResultBo
{
    private Long id;
    private Integer complaintStatus;
    private String result;
}

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java

@@ -130,6 +130,7 @@
                .set(EnforceComplaintLog::getResultId,loginUser.getUserId())
                .set(EnforceComplaintLog::getResultUser,loginUser.getNickName())
                .set(EnforceComplaintLog::getResultTime, DateUtils.getNowDate())
                .set(EnforceComplaintLog::getComplaintStatus, bo.getComplaintStatus())
                .set(EnforceComplaintLog::getComplaintResult, bo.getResult())
                .eq(EnforceComplaintLog::getId, bo.getId())
        );

 project-system/src/main/java/com/project/system/domain/vo/SysUserDeptTreeVo.java

New file
@@ -0,0 +1,22 @@
package com.project.system.domain.vo;

import lombok.Data;

import java.util.List;

/**
 * 功能描述：
 *
 * @author ZQN
 * @version 1.0
 */

@Data
public class SysUserDeptTreeVo
{
    private Long deptId;

    private String deptName;

    private List<SysUserDeptTreeVo> child;
}

 project-system/src/main/java/com/project/system/service/ISysUserDeptService.java

@@ -3,6 +3,7 @@
import com.project.common.mybatis.IBaseService;
import com.project.system.domain.SysUserDept;
import com.project.system.domain.bo.editBo.UserDeptBo;
import com.project.system.domain.vo.SysUserDeptTreeVo;
import com.project.system.domain.vo.UserDeptVo;

/**
@@ -26,4 +27,11 @@
     * @return  结果
     */
    Boolean batchUserDeptSave(UserDeptBo bo);

    /**
     * 用户多机构树
     * @param deptId    当前机构id
     * @return  结果
     */
    SysUserDeptTreeVo batchUserDeptTree(Long deptId);
}

 project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java

@@ -1,12 +1,16 @@
package com.project.system.service.impl;

import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.common.core.domain.entity.SysDept;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.StringUtils;
import com.project.system.domain.SysUserDept;
import com.project.system.domain.bo.editBo.UserDeptBo;
import com.project.system.domain.vo.SysUserDeptTreeVo;
import com.project.system.domain.vo.UserDeptVo;
import com.project.system.mapper.SysUserDeptMapper;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysUserDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +29,8 @@
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptMapper, SysUserDept> implements ISysUserDeptService {

    private final ISysDeptService deptService;


    /**
@@ -63,4 +69,36 @@
        }
        return this.saveBatch(saveList);
    }


    /**
     * 用户多机构树
     * @param deptId    参数
     * @return  结果
     */
    @Override
    public SysUserDeptTreeVo batchUserDeptTree(Long deptId)
    {
        Long checkDeptIdByLoginDeptId = deptService.getCheckDeptIdByLoginDeptId(deptId);
        return getDeptTree(checkDeptIdByLoginDeptId);
    }


    /**
     * 获取审批及其下级部门
     * @param deptId    审批部门id
     * @return  机构树
     */
    private SysUserDeptTreeVo getDeptTree(Long deptId)
    {
        SysUserDeptTreeVo vo = new SysUserDeptTreeVo();
        SysDept sysDept = deptService.selectDeptById(deptId);
        vo.setDeptId(sysDept.getDeptId());
        vo.setDeptName(sysDept.getDeptName());

        List<SysDept> list = deptService.list(deptService.lq().eq(SysDept::getParentId, deptId));
        List<SysUserDeptTreeVo> child = Convert.toList(SysUserDeptTreeVo.class, list);
        vo.setChild(child);
        return vo;
    }
}