Skip to content

Commit 9960021

Browse files
committed
fix: contract approval config log
--bug=1066406@tapd-34675357 --user=陈建星 【系统】模块设置-合同/报价/发票审批开关开启/关闭-生成操作日志-操作对象展示错误 https://www.tapd.cn/34675357/s/1852337
1 parent 09717b3 commit 9960021

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

backend/crm/src/main/java/cn/cordys/crm/system/service/DictService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,13 @@ public void switchDict(DictSwitchRequest request, String orgId) {
149149
originalVal.put("module.switch", !request.getEnable() ? Translator.get("log.enable.true") : Translator.get("log.enable.false"));
150150
Map<String, String> modifiedVal = new HashMap<>(1);
151151
modifiedVal.put("module.switch", request.getEnable() ? Translator.get("log.enable.true") : Translator.get("log.enable.false"));
152+
String resourceName = Translator.get("module." + request.getModule().toLowerCase());
153+
if (Strings.CI.equalsAny(request.getModule(), DictModule.CLUE_POOL_RS.name(), DictModule.CUSTOMER_POOL_RS.name(), DictModule.OPPORTUNITY_FAIL_RS.name())) {
154+
resourceName += Translator.get("module.reason.setting");
155+
}
152156
OperationLogContext.setContext(LogContextInfo.builder()
153157
.originalValue(originalVal)
154-
.resourceName(Translator.get("module." + request.getModule().toLowerCase()) + Translator.get("module.reason.setting"))
158+
.resourceName(resourceName)
155159
.modifiedValue(modifiedVal)
156160
.resourceId(request.getModule())
157161
.build());

backend/crm/src/main/resources/i18n/cordys-crm_en_US.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ module.reason.setting=Reason settings
128128
module.opportunity_fail_rs=Opportunity failed
129129
module.customer_pool_rs=Moved to account pool
130130
module.clue_pool_rs=Moved to lead pool
131+
module.quotation_approval=Quotation approval
132+
module.contract_approval=Contract approval
133+
module.invoice_approval=Invoice approval
131134
module.desensitization_set=Desensitization set
132135
log.sort=Sort
133136
log.placeholder=Input placeholder

backend/crm/src/main/resources/i18n/cordys-crm_zh_CN.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ module.reason.setting=原因设置
128128
module.opportunity_fail_rs=商机失败
129129
module.customer_pool_rs=移入公海
130130
module.clue_pool_rs=移入线索池
131+
module.quotation_approval=报价审批
132+
module.contract_approval=合同审批
133+
module.invoice_approval=发票审批
131134
module.desensitization_set=脱敏设置
132135
log.sort=排序
133136
log.placeholder=输入提示文字

0 commit comments

Comments
 (0)