diff --git a/src/main/java/com/bonus/gs/sub/evaluate/filter/SensitiveWordFilter.java b/src/main/java/com/bonus/gs/sub/evaluate/filter/SensitiveWordFilter.java index 2cca960..4954cd4 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/filter/SensitiveWordFilter.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/filter/SensitiveWordFilter.java @@ -17,6 +17,10 @@ public class SensitiveWordFilter { // 初始化敏感词列表 sensitiveWords.add("gsdl"); sensitiveWords.add("sbd"); + sensitiveWords.add("送变电"); + sensitiveWords.add("送电"); + sensitiveWords.add("输电"); + sensitiveWords.add("变电"); } @@ -42,7 +46,7 @@ public class SensitiveWordFilter { for (String word : sensitiveWords) { if (text.contains(word)) { // 将敏感词替换为*号 - text = text.replaceAll(word, repeatChar('*', word.length())); + text = text.replaceAll(word, repeatChar('-', word.length())); } } return text; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java index 77468ee..4d3fa3b 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java @@ -37,10 +37,10 @@ public class ViolationServiceImpl implements ViolationService { selected.setIdCard(o.getIdCard()); int isAc =dao.getOutSourceNumById(selected); - if(isAc>0){ + /*if(isAc>0){ ar.setFailMsg("身份证号码已存在!"); return ar; - } + }*/ selected=new ViolationBean(); selected.setEnterpriseName(o.getEnterpriseName()); @@ -104,10 +104,10 @@ public class ViolationServiceImpl implements ViolationService { selected.setId(o.getId()); selected.setIdCard(o.getIdCard()); int isAc =dao.getOutSourceNumById(selected); - if(isAc>0){ + /*if(isAc>0){ ar.setFailMsg("身份证号码已存在!"); return ar; - } + }*/ selected=new ViolationBean(); selected.setId(o.getId()); diff --git a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html index c870044..b8af56b 100644 --- a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html +++ b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html @@ -69,14 +69,14 @@ autocomplete="off" class="layui-input" lay-verify="required"> -
- -
- -
-
+ + + + + + + +
@@ -162,10 +162,10 @@ // 提交事件 form.on('submit(formDemo)', function (data) { //对身份证和手机号验证 - if (!checkPsidno($("#idCard").val())) { - layer.msg("身份证号码格式不正确", {icon: 2, time: 2000}); - return false; - } + // if (!checkPsidno($("#idCard").val())) { + // layer.msg("身份证号码格式不正确", {icon: 2, time: 2000}); + // return false; + // } if (!phone_reg($("#phone").val())) { layer.msg("手机号码格式不正确", {icon: 2, time: 2000}); return false; @@ -181,7 +181,7 @@ let params = {}; params.corporateName = encryptCBC(data.corporateName) params.enterpriseName = encryptCBC(data.enterpriseName) - params.idCard = encryptCBC(data.idCard) + // params.idCard = encryptCBC(data.idCard) params.phone = encryptCBC(data.phone) params.setTime = encryptCBC(data.setTime) params.socialCreditCode = encryptCBC(data.socialCreditCode) diff --git a/src/main/resources/static/pages/evaluate/person/editPerson.html b/src/main/resources/static/pages/evaluate/person/editPerson.html index fe24f6e..e2dca39 100644 --- a/src/main/resources/static/pages/evaluate/person/editPerson.html +++ b/src/main/resources/static/pages/evaluate/person/editPerson.html @@ -28,13 +28,13 @@
-
+