From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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..a58b286 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyServiceImpl.java
+++ b/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);
}
--
Gitblit v1.9.3