Compare commits

...

2 Commits

Author SHA1 Message Date
zhouxy a14ad08b66 Merge remote-tracking branch 'origin/master' 2026-02-25 15:47:02 +08:00
zhouxy 64fd3d3bf2 修复强制注销审批报错的bug 2026-02-25 15:46:32 +08:00
1 changed files with 2 additions and 2 deletions

View File

@ -601,10 +601,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
iXrForceDeregisterResService.saveOrUpdate(xrForceDeregisterRes);
iXrForceNoticeService.saveOrUpdate(xrForceNotice);
Map<String, Object> data = new HashMap<>();
String nameByCode = gzaiccodeService.getNameByCode(gzaiccodeService.getNameByCode(StringUtils.clearRegionZero(xrForceSpe.getRegOrg())));
String nameByCode = gzaiccodeService.getNameByCode(xrForceSpe.getRegOrg());
data.put("areaName", StringUtils.trimToEmpty(nameByCode));
data.put("writNo", StringUtils.trimToEmpty(tsWritModel.getWritsno()));
data.put("writContent", StringUtils.trimToEmpty(replaceContent));
data.put("htmlContent", StringUtils.trimToEmpty(replaceContent));
LocalDate now = LocalDate.now();
data.put("year", String.valueOf(now.getYear()));
data.put("month", String.valueOf(now.getMonthValue() > 9 ? now.getMonthValue() : "0" + now.getMonthValue()));