cf9b836069e0a76571c6611642b2d7abb0586a2b..4dadac0d032c1b2543ff9bd7251d73a90f8e3b11
2023-09-14 jiaosong
Merge remote-tracking branch 'origin/dev' into dev
4dadac 对比 | 目录
2023-09-14 jiaosong
#自测修改
a7a57c 对比 | 目录
已修改2个文件
31 ■■■■■ 文件已修改
server/service/src/main/java/com/doumee/core/utils/Constants.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -38,6 +38,7 @@
    public static final String CATEGORY_IMG = "CATEGORY_IMG";
    public static final String GOODS_IMG ="GOODS_IMG" ;
    public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE";
    public static final String COMPANY_MANAGE_ROLE = "COMPANY_MANAGE_ROLE";
    /**
     * 企业数据来源 0平台注册 1后台导入
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictBiz;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -16,9 +18,15 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.SystemUserRoleMapper;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.service.business.CompanyService;
import com.doumee.service.system.SystemDictService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -47,6 +55,14 @@
    @Autowired
    private SystemUserMapper systemUserMapper;
    @Autowired
    private SystemUserRoleMapper systemUserRoleMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
@@ -87,6 +103,20 @@
                        .eq(SystemUser::getId,company.getManagerId())
                        .set(SystemUser::getCompanyId,insert.getId());
        systemUserMapper.update(null,systemUserQuery);
        SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE);
        SystemUserRole systemUserRole = new SystemUserRole();
        systemUserRole.setUserId(company.getManagerId());
        systemUserRole.setRoleId(Integer.valueOf(dictData.getCode()));
        systemUserRole.setCreateTime(new Date());
        systemUserRole.setUpdateTime(new Date());
        systemUserRole.setCreateUser(userInfo.getId());
        systemUserRole.setUpdateUser(userInfo.getId());
        systemUserRole.setDeleted(Boolean.FALSE);
        systemUserRoleMapper.insert(systemUserRole);
        return company.getId();
    }