From c3f7a0f86009efe7fd2a568b743232499f95132d Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 19 十月 2023 15:20:15 +0800 Subject: [PATCH] 人员、组织机构,查询接口调试 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 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 f0359e8..5bfd13b 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 @@ -567,6 +567,9 @@ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭 orderDTO.setTemplateOid(templateVO.getOid()); + orderDTO.setCreator(rowData.getCreator()); + orderDTO.setLastModifier(rowData.getEditor()); + orderDTO.setLcStatus(rowData.getStatus()); if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁 @@ -581,7 +584,7 @@ orderDTO.setCodeRuleOid(ruleVO.getOid()); orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜 orderDTO.setData(rowData.getFiledValue()); - String code=engineService.addSaveCode(orderDTO); + String code=engineService.addSaveCodeNotauthUser(orderDTO,false); if(StringUtils.isNotBlank(code)) { StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); @@ -836,6 +839,9 @@ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭 orderDTO.setTemplateOid(templateVO.getOid()); + orderDTO.setCreator(rowData.getCreator()); + orderDTO.setLastModifier(rowData.getEditor()); + orderDTO.setLcStatus(rowData.getStatus()); if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁 @@ -850,7 +856,7 @@ orderDTO.setCodeRuleOid(ruleVO.getOid()); orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜 orderDTO.setData(rowData.getFiledValue()); - String code=engineService.addSaveCode(orderDTO); + String code=engineService.addSaveCodeNotauthUser(orderDTO,false); if(StringUtils.isNotBlank(code)) { StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); @@ -1288,7 +1294,7 @@ boolean issucess=false; String resultStr = ""; String errorid="0"; - msg="鎴愬姛"; + msg = "鏁版嵁鏌ヨ鎴愬姛"; String systemId=""; log.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data); log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType); @@ -1375,8 +1381,8 @@ TreeQueryObject treeQueryObject=new TreeQueryObject(); treeQueryObject.setParentOid(oid); treeQueryObject.setQueryAllLevel(true); - dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject); - dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0])); + dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid);//.selectCodeClassifyDOByTree(treeQueryObject); + //dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0])); Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t)); List<PropertyVO> propertyVOS=condtionVO.getPro(); @@ -1453,6 +1459,9 @@ dataObjectVOS.add(dataObjectVO); }); resultDataVO.setObject(dataObjectVOS); + }else{ + errorid = "0"; + msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勬暟鎹�"; } }else{ errorid = "101"; @@ -1463,8 +1472,6 @@ errorid = "101"; msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅"; } - errorid = "0"; - msg = "鏁版嵁鏌ヨ鎴愬姛"; }catch (Throwable e){ e.printStackTrace();; msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage(); -- Gitblit v1.9.3