From e2f5e981002e85fdde8cc03a8d9826db66021b08 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 10:46:50 +0800
Subject: [PATCH] 修復bug
---
server/src/main/resources/mappers/BomExtMapper.xml | 2 +-
server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java | 28 +++++++++-------------------
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
index d0a26be..256c3b0 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
+++ b/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);
}
diff --git a/server/src/main/resources/mappers/BomExtMapper.xml b/server/src/main/resources/mappers/BomExtMapper.xml
index 2ae61f3..5d5cd41 100644
--- a/server/src/main/resources/mappers/BomExtMapper.xml
+++ b/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,
--
Gitblit v1.9.3