git ch

k94314517

2024-04-12 7341852b4449d689a7320b4f345ad2a10e47951e

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -194,6 +194,12 @@
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更换重试~");
        }

        SystemUser user = new SystemUser();
        user.setUsername(company.getUsername());
        // 生成密码盐
@@ -205,6 +211,7 @@
        user.setFixed(Boolean.TRUE);
        user.setDeleted(Boolean.FALSE);
        user.setCompanyId(company.getId());
        user.setRealname(company.getLegalName());
        user.setMobile(company.getPhone());
        user.setCreateUser(company.getCreator());
        user.setCreateTime(company.getCreateDate());
@@ -216,6 +223,12 @@
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .ne(SystemUser::getUsername,company.getUsername())
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更新重试~");
        }
        SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
@@ -234,10 +247,12 @@
            user.setCompanyId(company.getId());
            user.setMobile(company.getPhone());
            user.setCreateUser(company.getCreator());
            user.setRealname(company.getLegalName());
            user.setCreateTime(company.getCreateDate());
            user.setStatus(Constants.ZERO);
            systemUserMapper.insert(user);//插入新的管理员账号
        }else{
            model.setMobile(company.getPhone());
            model.setUsername(company.getUsername());
            model.setCreateUser(company.getCreator());
            model.setCreateTime(company.getCreateDate());
@@ -814,7 +829,7 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {

        }else{
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){