From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 10 一月 2024 00:01:10 +0800 Subject: [PATCH] defaultReferDataGrid接口修改,实现兼容高级查询sql拼接;修改流水处理接口,增加流水处理跳出判断 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java index f2d1d0b..ad4b63b 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java @@ -750,7 +750,6 @@ */ @Override public R flowingDependencyGen(String classifyOid) { - //鏌ヨ姝ゅ垎绫讳笅闈㈢殑鎵�鏈夊垎绫� List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(classifyOid,AuthUtil.getTenantId(),null); //鏌ヨ鐮佸�艰〃锛岃幏鍙栨渶澶ф祦姘� @@ -758,6 +757,17 @@ .map(classfiy -> classfiy.getOid()).collect(Collectors.joining("','")) + "'","'${sav}'"); //寰�娴佹按琛ㄩ噷闈㈠姞鏁版嵁锛屾湁鍒欐洿鏂帮紝鏃犲垯娣诲姞鏁版嵁銆� for (CodeAllCode codeAllCodeVO : codeAllCodeVOS) { + if(Func.isEmpty(codeAllCodeVO.getSerialUnit())){ + throw new ServiceException("缂栫爜涓猴細" + codeAllCodeVO.getId() + "鐨勭爜鍊兼暟鎹祦姘翠緷璧栦笉鑳戒负绌猴紒"); + } + try { + CodeRuleVO codeRuleVO = codeRuleService.getObjectByOid(codeAllCodeVO.getCodeRuleOid()); + if(Func.isEmpty(codeRuleVO)){ + continue; + } + }catch (Exception e){ + continue; + } QueryWrapper<CodeBasicSec> secWrapper = new QueryWrapper<>(); secWrapper.eq("PKCODERULE",codeAllCodeVO.getCodeRuleOid()); secWrapper.eq("SECTYPE","codeserialsec"); -- Gitblit v1.9.3