fix: 87553 市场法规清单-查看标准库中已删除的数据,提示操作失败
This commit is contained in:
@@ -35,6 +35,7 @@ public class ResultCommon {
|
|||||||
public static final String EMPTY_COMMON = "message.empty.common"; // {0}不能为空
|
public static final String EMPTY_COMMON = "message.empty.common"; // {0}不能为空
|
||||||
public static final String EXIST_STANDARD_NUMBER = "message.exists.standard.number"; // 标准编号已经存在
|
public static final String EXIST_STANDARD_NUMBER = "message.exists.standard.number"; // 标准编号已经存在
|
||||||
public static final String NOT_EXIST_PARAM = "message.no.exists.param"; // 参数{0}不存在
|
public static final String NOT_EXIST_PARAM = "message.no.exists.param"; // 参数{0}不存在
|
||||||
|
public static final String NOT_EXIST_STANDARD = "message.no.exists.standard"; // 参数{0}不存在
|
||||||
public static final String NO_PERMISSION = "message.no.permission"; // 没有数据操作权限
|
public static final String NO_PERMISSION = "message.no.permission"; // 没有数据操作权限
|
||||||
public static final String SELECT_DATA = "message.select.data"; // 请选择数据
|
public static final String SELECT_DATA = "message.select.data"; // 请选择数据
|
||||||
public static final String EXIST_SUB_FOLDERS = "message.exist.sub.folders"; // 文件夹下有子文件夹 ,该文件夹不允许删除
|
public static final String EXIST_SUB_FOLDERS = "message.exist.sub.folders"; // 文件夹下有子文件夹 ,该文件夹不允许删除
|
||||||
|
|||||||
+11
@@ -161,6 +161,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
private ILawsPartNameStandardService partNameStandardService;
|
private ILawsPartNameStandardService partNameStandardService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseAPI;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
|
@Resource
|
||||||
|
private ILawsEnterpriseStandardService esService;
|
||||||
|
@Resource
|
||||||
|
private ILawsDomesticStandardService fbService;
|
||||||
|
|
||||||
public static boolean ENCRYPT_ENABLE;
|
public static boolean ENCRYPT_ENABLE;
|
||||||
public static String DECRYPT_URL;
|
public static String DECRYPT_URL;
|
||||||
@@ -1258,11 +1262,18 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
ManyStandardSelectionBox singleStandard;
|
ManyStandardSelectionBox singleStandard;
|
||||||
if (StrUtil.isNotBlank(id)) {
|
if (StrUtil.isNotBlank(id)) {
|
||||||
singleStandard = getSingleStandard(null, id);
|
singleStandard = getSingleStandard(null, id);
|
||||||
|
if (singleStandard == null) {
|
||||||
|
throw new JeroBootException(ResultCommon.NOT_EXIST_STANDARD);
|
||||||
|
}
|
||||||
standardNumber = singleStandard.getStandardNumber();
|
standardNumber = singleStandard.getStandardNumber();
|
||||||
} else {
|
} else {
|
||||||
singleStandard = getSingleStandard(standardNumber, null);
|
singleStandard = getSingleStandard(standardNumber, null);
|
||||||
|
if (singleStandard == null) {
|
||||||
|
throw new JeroBootException(ResultCommon.NOT_EXIST_STANDARD);
|
||||||
|
}
|
||||||
id = singleStandard.getId();
|
id = singleStandard.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取要操作的表名
|
// 获取要操作的表名
|
||||||
String tableName = TableNameEnum.getTableName(module);
|
String tableName = TableNameEnum.getTableName(module);
|
||||||
// 获取全部字段
|
// 获取全部字段
|
||||||
|
|||||||
@@ -76,3 +76,4 @@ assess.delete.error=\u672A\u7B26\u5408\u9879\u4E2D\u6709\u6574\u6539\u4E2D\u3001
|
|||||||
assess.delete.error2=\u9879\u76EE\u4E2D\u6709\u8BC4\u4F30\u4E2D\u7684\u6570\u636E\u65F6\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
|
assess.delete.error2=\u9879\u76EE\u4E2D\u6709\u8BC4\u4F30\u4E2D\u7684\u6570\u636E\u65F6\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664
|
||||||
new.en.standard.number.conflict=\u8BE5\u65B0\u4F01\u6807\u7F16\u53F7\u4E0E\u5DF2\u5B58\u5728\u7684\u4F01\u6807\u7F16\u53F7\u91CD\u590D\uFF0C\u8BF7\u91CD\u65B0\u4FEE\u6539\u63D0\u4EA4
|
new.en.standard.number.conflict=\u8BE5\u65B0\u4F01\u6807\u7F16\u53F7\u4E0E\u5DF2\u5B58\u5728\u7684\u4F01\u6807\u7F16\u53F7\u91CD\u590D\uFF0C\u8BF7\u91CD\u65B0\u4FEE\u6539\u63D0\u4EA4
|
||||||
zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\u5728\u4E00\u4E2Aexcel\u4E3A\u5BFC\u5165\u6570\u636E
|
zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\u5728\u4E00\u4E2Aexcel\u4E3A\u5BFC\u5165\u6570\u636E
|
||||||
|
message.no.exists.standard=\u6807\u51C6\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
|
||||||
@@ -84,3 +84,4 @@ new.en.standard.number.conflict=The new enterprise standard number is duplicated
|
|||||||
process.already.distributed=The process has been distributed, do not reject!
|
process.already.distributed=The process has been distributed, do not reject!
|
||||||
process.not.countersignature=It is not a countersign node task!
|
process.not.countersignature=It is not a countersign node task!
|
||||||
zip_root_one_excel=The zip file contains more than one excel file
|
zip_root_one_excel=The zip file contains more than one excel file
|
||||||
|
message.no.exists.standard=The standard does not exist
|
||||||
|
|||||||
@@ -83,3 +83,4 @@ new.en.standard.number.conflict=\u8BE5\u65B0\u4F01\u6807\u7F16\u53F7\u4E0E\u5DF2
|
|||||||
process.already.distributed=\u6D41\u7A0B\u5DF2\u5206\u53D1,\u7981\u6B62\u9A73\u56DE!
|
process.already.distributed=\u6D41\u7A0B\u5DF2\u5206\u53D1,\u7981\u6B62\u9A73\u56DE!
|
||||||
process.not.countersignature=\u4E0D\u662F\u4F1A\u7B7E\u8282\u70B9\u4EFB\u52A1!
|
process.not.countersignature=\u4E0D\u662F\u4F1A\u7B7E\u8282\u70B9\u4EFB\u52A1!
|
||||||
zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\u5728\u4E00\u4E2Aexcel\u4E3A\u5BFC\u5165\u6570\u636E
|
zip_root_one_excel=\u538B\u7F29\u5305\u6839\u76EE\u5F55\u4E0B\u4EC5\u80FD\u5B58\u5728\u4E00\u4E2Aexcel\u4E3A\u5BFC\u5165\u6570\u636E
|
||||||
|
message.no.exists.standard=\u6807\u51C6\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
|
||||||
|
|||||||
Reference in New Issue
Block a user