From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
index 9cfb50d..23af6e9 100644
--- a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
+++ b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
@@ -49,10 +49,11 @@
String year = map.get("year");
if (map.get("projectId")!=null){
Map<String, String> mapProject = baseDao.getMapProjectIdentity(map.get("projectId"));
- newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",mapProject.get("identity"));
+ newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",mapProject.get("software_identity"));
year = mapProject.get("year");
}
newCodeTemplet = newCodeTemplet.replace("[骞翠唤]",year);
+
String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());
newCodeTemplet = newCodeTemplet.replace("[搴忓彿]",xhTemplet);
int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);
--
Gitblit v1.9.1