From 7795e413db43b5c2e282fcdb9607c059e09eceb5 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 19 十月 2023 08:49:16 +0800 Subject: [PATCH] 申请/维护接口人员存储测试 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java index d6a3859..f0359e8 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java @@ -1152,10 +1152,11 @@ } QueryData queryData=queryClassifyVO.getData(); UserVO userVo=queryData.getUser(); + systemId=queryData.getSystemId(); //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭� //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest()); passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest()); - systemId=queryData.getSystemId(); + QueryLibraryVO libraryVO= queryData.getLibrary(); String libId= libraryVO.getId(); List<String> classifyIdList= libraryVO.getClassifyid(); @@ -1180,7 +1181,7 @@ throw new Throwable("鎺ュ彛鍙傛暟锛氳处鍙蜂俊鎭幏鍙栧け璐�"); } List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, libId)); - if(CollectionUtils.isEmpty(libIdDos)) { + if(!CollectionUtils.isEmpty(libIdDos)) { CodeClassify libCodeClassify =libIdDos.get(0); String oid=libCodeClassify.getOid(); if (!CollectionUtils.isEmpty(classifyIdList)) { @@ -1529,10 +1530,11 @@ } QueryData queryData=queryClassifyVO.getData(); UserVO userVo=queryData.getUser(); + systemId=queryData.getSystemId(); //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭� //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest()); passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest()); - systemId=queryData.getSystemId(); + QueryLibraryVO libraryVO= queryData.getLibrary(); String libId= libraryVO.getId(); List<String> classifyIdList= libraryVO.getClassifyid(); @@ -1598,7 +1600,7 @@ String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+""; String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName(); String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription(); - CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description); + CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,id,"",description); codeSectionValueVOList.add(sectionValueVO); }); }else if(secType.equals("codeclassifysec")){//鍒嗙被鐮佹 @@ -1674,8 +1676,8 @@ String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString(); String value = Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString(); String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString(); - String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString(); - CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description); + String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString(); + CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, id, "", description); codeSectionValueVOList.add(sectionValueVO); }); } -- Gitblit v1.9.3