修复bug

jiangping

2023-08-21 14bd6c7472152a9b466500fc70471ab75b73b277

 server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java

@@ -71,6 +71,8 @@
        company.setUpdateUser(user.getId());
        company.setDeleted(Constants.ONE);
        companyMapper.updateById(company);
        Company company1 = companyMapper.selectById(company.getId());
        initRedisCache(company1);
    }

    @Override
@@ -123,36 +125,26 @@
        update.setStatus(company.getStatus());
        update.setDingdingInfo(company.getDingdingInfo());
        companyMapper.updateById(update);
        Company company1 = companyMapper.selectById(company.getId());
//        更新记录

        CompanyLog companyLog = new CompanyLog();
        companyLog.setDeleted((byte)Constants.ZERO);
        companyLog.setUpdateUser(principal.getId());
        companyLog.setCreateUser(principal.getId());
        companyLog.setCreateTime(new Date());
        companyLog.setUpdateTime(new Date());
        companyLog.setCompanyId(company.getId());
        if(Objects.nonNull(company.getStatus())){
            CompanyLog companyLog = new CompanyLog();
            companyLog.setDeleted((byte)Constants.ZERO);
            companyLog.setUpdateUser(principal.getId());
            companyLog.setCreateUser(principal.getId());
            companyLog.setCreateTime(new Date());
            companyLog.setUpdateTime(new Date());
            companyLog.setRemark(company.getStatus() == 1 ? "数据启用" : "数据禁用");
            companyLog.setCompanyId(company.getId());
            companyLog.setUpdateType(company.getStatus() == 1 ? Constants.CompanyUpdateType.UPDATE_ENABLE.getKey()
                    : Constants.CompanyUpdateType.UPDATE_DISABLE.getKey());
            companyLog.setDetail(company.getStatus() == 1 ? "数据启用" : "数据禁用");
            companyLogService.create(companyLog);
        }else {
            CompanyLog companyLog = new CompanyLog();
            companyLog.setDeleted((byte)Constants.ZERO);
            companyLog.setUpdateUser(principal.getId());
            companyLog.setCreateUser(principal.getId());
            companyLog.setCreateTime(new Date());
            companyLog.setUpdateTime(new Date());
            companyLog.setRemark("更新企业数据");
            companyLog.setCompanyId(company.getId());
            companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_CONTENT.getKey());
            companyLog.setDetail("更新企业数据");
            companyLogService.create(companyLog);
        }

        companyLogService.create(companyLog);
        Company company1 = companyMapper.selectById(company.getId());
        initRedisCache(company1);
    }