gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复keyring可信证书不可取消审核和导入内置判断：1or0

Browse Source
This commit is contained in:
wangwei
2019-06-14 16:43:58 +08:00
parent 2190ee447d
commit 3aebe7d905
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -374,12 +374,16 @@ public class PxyObjKeyringController extends BaseController {
entity); entity);
//查询是否存在内置配置 //查询是否存在内置配置
PxyObjKeyring searchEntity=new PxyObjKeyring(); PxyObjKeyring searchEntity0=new PxyObjKeyring();
searchEntity.setCompileId(0); searchEntity0.setCompileId(0);
PxyObjKeyring searchEntity1=new PxyObjKeyring();
searchEntity1.setCompileId(1);
Page<PxyObjKeyring> searchPage=new Page<PxyObjKeyring>(); Page<PxyObjKeyring> searchPage=new Page<PxyObjKeyring>();
Page<PxyObjKeyring> builtInPage = pxyObjKeyringService.findPage(searchPage, Page<PxyObjKeyring> builtInPage0 = pxyObjKeyringService.findPage(searchPage,
searchEntity); searchEntity0);
if(builtInPage != null && !StringUtil.isEmpty(builtInPage.getList())) { Page<PxyObjKeyring> builtInPage1 = pxyObjKeyringService.findPage(searchPage,
searchEntity1);
if((builtInPage0 != null && !StringUtil.isEmpty(builtInPage0.getList())) || (builtInPage1 != null && !StringUtil.isEmpty(builtInPage1.getList()))) {
model.addAttribute("hasBuiltIn", true); model.addAttribute("hasBuiltIn", true);
}else { }else {
model.addAttribute("hasBuiltIn", false); model.addAttribute("hasBuiltIn", false);

2
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -400,7 +400,7 @@ function cancelPassOpt(url){
if(typeof serviceId != "undefined" && serviceIdJudge && typeof compileId != "undefined"){ if(typeof serviceId != "undefined" && serviceIdJudge && typeof compileId != "undefined"){
compileIds.push(compileId); compileIds.push(compileId);
} }
if((compileId == 0) || (compileId==1 && serviceId==250)){ if((compileId == 0) || (compileId==1 && serviceId==250) || (compileId==1 && serviceId==520)){
builtInCompile=true; builtInCompile=true;
} }
}); });