From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 24 七月 2023 17:29:24 +0800 Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 11 ++++++++++- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 14 +++++++++++--- Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java index 24fc9ea..d87566d 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java @@ -457,16 +457,24 @@ CodeClassifyTemplate codeClassifyTemplateDO = baseMapper.selectById(oid); //鍋滅敤鐨勬椂鍊欙紝楠岃瘉妯℃澘鏄惁涓哄凡鍙戝竷 if(CodeClassifyTemplateLC.DISABLED.getValue().equals(lcStatus)){ -// CodeClstemplateEntity codeClassifyTemplateDO = baseMapper.selectById(oid); if(!CodeClassifyTemplateLC.RELEASED.getValue().equals(codeClassifyTemplateDO.getLcStatus())){ return R.fail("妯℃澘鏈惎鐢紝涓嶈兘鍋滅敤锛�"); } } + + if(lcStatus.equals(CodeClassifyTemplateLC.RELEASED.getValue())){ + QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>(); + classifyQueryWrapper.eq("oid",codeClassifyTemplateDO.getCodeClassifyOid()); + classifyQueryWrapper.eq("lcstatus","Enabled"); + List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(classifyQueryWrapper); + if(codeClassifyList.size()==0){ + return R.fail("鏌ヨ鍒版墍灞炲垎绫绘湭鍚敤锛岃鍏堣繘琛屽惎鐢紒锛侊紒"); + } + } + //鍚敤銆佸仠鐢� codeClassifyTemplateDO.setLcStatus(lcStatus); int u = baseMapper.updateById(codeClassifyTemplateDO); -// codeClassifyTemplateMapper.updateLcStatus(oid,lcStatus); - return u==0?R.fail("淇敼澶辫触锛�"):R.success("淇敼鎴愬姛"); } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index 7fc0b61..b92da82 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -430,6 +430,7 @@ cbo.setLastModifyTime(new Date()); cbo.setCreator(AuthUtil.getUser().getUserName()); cbo.setLastModifier(AuthUtil.getUser().getUserName()); + cbo.setTenantId(AuthUtil.getTenantId()); // //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁� cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName()); // //end -- modify by lihang @20220407 @@ -2045,13 +2046,21 @@ sql.append("t."); } if (value.startsWith(QueryOptionConstant.IN)) { - sql.append(selectKey) + if(value.startsWith(QueryOptionConstant.IN+"('") && value.endsWith("')")){ + sql.append(selectKey) + .append(SPACE) + .append("in") + .append(SPACE) + .append(value.replace(QueryOptionConstant.IN, "")); + }else{ + sql.append(selectKey) .append(SPACE) .append("in") .append(SPACE) .append("(") .append(value.replace(QueryOptionConstant.IN, "")) .append(")"); + } } else if (value.startsWith(QueryOptionConstant.NOTIN)) { sql.append(selectKey) .append(SPACE) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml index 2d6770b..ff6e118 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml @@ -480,7 +480,7 @@ from pl_sys_menu ps, pl_sys_menu pm where pm.is_deleted = 0 and ps.category = 1 - and ps.alias = #{btmType} + and ps.CODE = #{btmType} and ps.id = pm.parent_id order by pm.sort asc </select> -- Gitblit v1.9.3