(1)修复in() sql中使用了#导致的bug,#修改为$

(2)asn 策略组删除时判断其下有没有新增的ip，如果有，则不允许删除
2018-09-03 11:23:10 +08:00
parent bcba4c785d
commit bf0d81421b
10 changed files with 54 additions and 8 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1137,4 +1137,5 @@ can_not_edit_issued_ans_ip=Can not edit issued ASN IP
 is_issued=Is Issued
 asn_ip_configuration=ASN IP Configuration
 asn_policy=ASN Policy
-asn_ip_group=ASN IP Group
+asn_ip_group=ASN IP Group
+can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1134,4 +1134,5 @@ can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC
 is_issued=\u662F\u5426\u4E0B\u53D1
 asn_ip_configuration=ASN IP\u914D\u7F6E
 asn_policy=ASN\u7B56\u7565
-asn_ip_group=ASN IP\u7EC4
+asn_ip_group=ASN IP\u7EC4
+can_not_delete_has_ip_asn_group=\u4E0D\u80FD\u5220\u9664\u5305\u542BASN IP\u7684 ASN\u7EC4