Merge remote-tracking branch 'origin/master'

mitao

3 天以前 f769d817f8ba2522147c73fa93ccacdc3aab0cb6

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

@@ -22,6 +22,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 +72,8 @@
public class SysUserController extends BaseController {
    @Autowired
    private ISysUserService userService;
    @Autowired
    private OaApprovalFlowNodeService oaApprovalFlowNodeService;

    @Autowired
    private ISysRoleService roleService;
@@ -182,13 +185,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);
@@ -517,6 +519,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));
    }