diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java index 03f5b57..0d8b3f1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java @@ -601,7 +601,8 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl data = new HashMap<>(); - String nameByCode = gzaiccodeService.getNameByCode(xrForceSpe.getRegOrg()); + String orgNumber = StringUtils.fillZeroSuffix(StringUtils.clearRegionZero(xrForceSpe.getRegOrg()), 6); + String nameByCode = gzaiccodeService.getNameByCode(orgNumber); data.put("areaName", StringUtils.trimToEmpty(nameByCode)); data.put("writNo", StringUtils.trimToEmpty(tsWritModel.getWritsno())); data.put("htmlContent", StringUtils.trimToEmpty(replaceContent)); diff --git a/src/main/java/com/chinaweal/aiccs/common/util/StringUtils.java b/src/main/java/com/chinaweal/aiccs/common/util/StringUtils.java index d8a2d73..0c47e31 100644 --- a/src/main/java/com/chinaweal/aiccs/common/util/StringUtils.java +++ b/src/main/java/com/chinaweal/aiccs/common/util/StringUtils.java @@ -1,10 +1,7 @@ package com.chinaweal.aiccs.common.util; -import com.chinaweal.aiccs.common.constant.Constant; - import java.util.LinkedHashMap; import java.util.Map; -import java.util.Set; import java.util.UUID; /** @@ -282,4 +279,38 @@ public abstract class StringUtils extends org.apache.commons.lang3.StringUtils { } return str; } + + /** + * 后部补'0',将字串填充到目标长度 + * + * @param str 原字串 + * @param length 目标长度 + * @return 填充结果 + * @author lroyia + * @since 2023年6月1日 10:29:37 + */ + public static String fillZeroSuffix(String str, int length) { + StringBuilder sb = new StringBuilder(str); + while (sb.length() < length) { + sb.append('0'); + } + return sb.toString(); + } + + /** + * 前部补'0',将字串填充到目标长度 + * + * @param str 原字串 + * @param length 目标长度 + * @return 填充结果 + * @author lroyia + * @since 2023年6月1日 10:29:37 + */ + public static String fillZeroPrefix(String str, int length) { + StringBuilder sb = new StringBuilder(str); + while (sb.length() < length) { + sb.insert(0, '0'); + } + return sb.toString(); + } }