Merge remote-tracking branch 'origin/master'

mitao

9 小时以前 95d8e5f4348497b1eee5884086534c86b1661b4f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,4 +1,5 @@
package com.ruoyi.web.controller.system;
import java.util.Date;

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
@@ -22,6 +23,7 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
import com.ruoyi.system.importExcel.EmployeeImportExcel;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.SysUserVO;
@@ -71,6 +73,8 @@
public class SysUserController extends BaseController {
    @Autowired
    private ISysUserService userService;
    @Autowired
    private OaApprovalFlowNodeService oaApprovalFlowNodeService;

    @Autowired
    private ISysRoleService roleService;
@@ -182,13 +186,12 @@
    @Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@Validated @RequestBody SysUser user) {
        user.setUserName(user.getUserName());
        user.setUserName(user.getPhonenumber());
        if (!userService.checkUserNameUnique(user)) {
            return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        user.setUserName(user.getPhonenumber());
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        userService.insertUser(user);
@@ -234,7 +237,39 @@
        Map<String, TDept> deptMap = tDeptService.list().stream().collect(Collectors.toMap(TDept::getDeptName, e -> e));
        Map<String, SysRole> roleMap = roleService.selectRoleAll().stream().collect(Collectors.toMap(SysRole::getRoleName, e -> e));
        for (EmployeeImportExcel employeeExcel : employeeExcelList) {
            try {
            EmployeeImportExcel employeeImportExcel = new EmployeeImportExcel();
            String nickName = employeeImportExcel.getNickName();
            String sex = employeeImportExcel.getSex();
            String idCard = employeeImportExcel.getIdCard();
            Integer age = employeeImportExcel.getAge();
            String politicalOutlook = employeeImportExcel.getPoliticalOutlook();
            Date participationTime = employeeImportExcel.getParticipationTime();
            Date companyTime = employeeImportExcel.getCompanyTime();
            String firstDegree = employeeImportExcel.getFirstDegree();
            String firstCollege = employeeImportExcel.getFirstCollege();
            String firstMajor = employeeImportExcel.getFirstMajor();
            String highestDegree = employeeImportExcel.getHighestDegree();
            String highestCollege = employeeImportExcel.getHighestCollege();
            String highestMajor = employeeImportExcel.getHighestMajor();
            String department = employeeImportExcel.getDepartment();
            String position = employeeImportExcel.getPosition();
            Date positionTime = employeeImportExcel.getPositionTime();
            String phoneNumber = employeeImportExcel.getPhoneNumber();
            String organization = employeeImportExcel.getOrganization();
            String roleName = employeeImportExcel.getRoleName();
            if (!StringUtils.isEmpty(nickName)
                    &&!StringUtils.isEmpty(sex)
                    &&!StringUtils.isEmpty(idCard)
                    &&!StringUtils.isEmpty(phoneNumber)
                    &&!StringUtils.isEmpty(organization)
                    &&!StringUtils.isEmpty(roleName)
                    &&!StringUtils.isEmpty(department)
                    &&!StringUtils.isEmpty(highestCollege)
            ){
                // 到最后一行了
                break;
            }
                        try {
                // 数据验证
                if (StringUtils.isEmpty(employeeExcel.getNickName())) {
                    errorMessages.add("第" + (successCount + failCount + 1) + "行：姓名为空");
@@ -517,6 +552,15 @@
        if (userIds.contains(getUserId())) {
            return error("当前用户不能删除");
        }
        List<OaApprovalFlowNode> approvalFlowNodes = oaApprovalFlowNodeService.lambdaQuery().eq(OaApprovalFlowNode::getApprovalType, 2)
                .list();
        for (OaApprovalFlowNode approvalFlowNode : approvalFlowNodes) {
            for (String s : approvalFlowNode.getApprovalIds().split(",")) {
                if (s.equals(userIds.toString())) {
                    return error("审批流程:"+approvalFlowNode.getFlowName()+"存在该用户，请先删除该用户下的审批流程");
                }
            }
        }
        return AjaxResult.success(userService.deleteUserByIds(userIds));
    }