From 3aebe7d9058c0a1e95b2ac1cb839637f12bb0fa5 Mon Sep 17 00:00:00 2001 From: wangwei Date: Fri, 14 Jun 2019 16:43:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dkeyring=E5=8F=AF=E4=BF=A1?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=B8=8D=E5=8F=AF=E5=8F=96=E6=B6=88=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=92=8C=E5=AF=BC=E5=85=A5=E5=86=85=E7=BD=AE=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=9A1or0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/PxyObjKeyringController.java | 14 +++++++++----- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index dc0db66ff..47197b77f 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -374,12 +374,16 @@ public class PxyObjKeyringController extends BaseController { entity); //查询是否存在内置配置 - PxyObjKeyring searchEntity=new PxyObjKeyring(); - searchEntity.setCompileId(0); + PxyObjKeyring searchEntity0=new PxyObjKeyring(); + searchEntity0.setCompileId(0); + PxyObjKeyring searchEntity1=new PxyObjKeyring(); + searchEntity1.setCompileId(1); Page searchPage=new Page(); - Page builtInPage = pxyObjKeyringService.findPage(searchPage, - searchEntity); - if(builtInPage != null && !StringUtil.isEmpty(builtInPage.getList())) { + Page builtInPage0 = pxyObjKeyringService.findPage(searchPage, + searchEntity0); + Page builtInPage1 = pxyObjKeyringService.findPage(searchPage, + searchEntity1); + if((builtInPage0 != null && !StringUtil.isEmpty(builtInPage0.getList())) || (builtInPage1 != null && !StringUtil.isEmpty(builtInPage1.getList()))) { model.addAttribute("hasBuiltIn", true); }else { model.addAttribute("hasBuiltIn", false); diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index ee45509a6..fae808932 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -400,7 +400,7 @@ function cancelPassOpt(url){ if(typeof serviceId != "undefined" && serviceIdJudge && typeof compileId != "undefined"){ compileIds.push(compileId); } - if((compileId == 0) || (compileId==1 && serviceId==250)){ + if((compileId == 0) || (compileId==1 && serviceId==250) || (compileId==1 && serviceId==520)){ builtInCompile=true; } });