jiangping
2023-08-16 e2f5e981002e85fdde8cc03a8d9826db66021b08
修復bug
已修改2个文件
30 ■■■■■ 文件已修改
server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/resources/mappers/BomExtMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
@@ -123,36 +123,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);
    }
server/src/main/resources/mappers/BomExtMapper.xml
@@ -564,7 +564,7 @@
    `dmodel`.`STATUS` AS DMODEL_STATUS,
    `dmodel`.`VALID_TIME` AS DMODEL_VALID_TIME,
    `dmodel`.`INVALID_TIME` AS DMODEL_INVALID_TIME,
    `mmodel`.`ID` AS realMaterialId,
    `mmodel`.`ID` AS MMODEL_ID,
    `mmodel`.`DELETED` AS MMODEL_DELETED,
    `mmodel`.`CREATE_USER` AS MMODEL_CREATE_USER,
    `mmodel`.`CREATE_TIME` AS MMODEL_CREATE_TIME,