From 248a2dbe8a847bd657b9dbc525b4e5718cda2de0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 4 Sep 2023 10:03:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tag/service/impl/ILawsTagServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java index b6ab3e1a..7fe3c9e9 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java @@ -93,8 +93,11 @@ public class ILawsTagServiceImpl extends ServiceImpl imp lawsTag.setIsReadOnly(Integer.valueOf(FixedFieldEnum.NON_FIXED_FIELD_ENUM.getValue())); lawsTag.setIsShowForm(Integer.valueOf(YesOrNoEnum.YES.getValue())); //TODO 可以自定义数据库字段名 - //String pinYin = HanYuPinYinUtil.changeToNumberPinYin(lawsTag.getDbFieldTxt()); - //lawsTag.setDbFieldName(pinYin.replace(" ","_")); + String dbFieldName1 = lawsTag.getDbFieldName(); + if (StringUtils.isBlank(dbFieldName1)){ + String pinYin = HanYuPinYinUtil.changeToNumberPinYin(lawsTag.getDbFieldTxt()); + lawsTag.setDbFieldName(pinYin.replace(" ","_")); + } String dbFieldName = lawsTag.getDbFieldName(); // 数据库的字段名称必须以字母开头，若不以字母开头加上固定的grp前缀 if (!Validator.isMatchRegex("^[a-zA-Z].*$", dbFieldName)){ @@ -124,8 +127,11 @@ public class ILawsTagServiceImpl extends ServiceImpl imp //字段名称设置成拼音+下划线,存入数据库 //TODO 可以自定义数据库字段名 - //String pinYin = HanYuPinYinUtil.changeToNumberPinYin(lawsTag.getDbFieldTxt()); - //lawsTag.setDbFieldName(pinYin.replace(" ","_")); + String dbFieldName1 = lawsTag.getDbFieldName(); + if (StringUtils.isBlank(dbFieldName1)){ + String pinYin = HanYuPinYinUtil.changeToNumberPinYin(lawsTag.getDbFieldTxt()); + lawsTag.setDbFieldName(pinYin.replace(" ","_")); + } //处理DBLength为null的情况，默认为100 Integer dbLength = lawsTag.getDbLength(); if (dbLength == null){ @@ -156,7 +162,7 @@ public class ILawsTagServiceImpl extends ServiceImpl imp lawsTag.setIsShowForm(Integer.valueOf(YesOrNoEnum.YES.getValue())); // 数据库的字段名称必须以字母开头，若不以字母开头加上固定的grp前缀 - String dbFieldName = lawsTag.getDbFieldName(); + String dbFieldName = dbFieldName1; if (!Validator.isMatchRegex("^[a-zA-Z].*$", dbFieldName)){ lawsTag.setDbFieldName("grp_" + dbFieldName); }