From cd349488b2bcf439abfc42bb219e4e9bdce736f4 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期五, 13 十月 2023 14:28:30 +0800 Subject: [PATCH] 状态接口使用范围后端接口增加 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java index f02f7e6..3562907 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java @@ -114,9 +114,6 @@ private RevisionModelUtil revisionModelUtil; @Resource - private NacosConfigCache nacosConfigCache; - - @Resource private ICodeFixedValueService codeFixedValueService; /** @@ -128,8 +125,8 @@ @Override public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException { //濡傛灉绛変簬鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛id鍜岀鐞嗙粍瓒呯璐﹀彿锛屽氨涓嶉渶瑕佹寜鐓ц鍒欐墍鏈夎�呮潵杩涜鏌ヨ - if(!(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) - && AuthUtil.getUserId().toString().equals(nacosConfigCache.getAdminUserInfo().getUserId().toString())) + if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId()) + && AuthUtil.getUserId().toString().equals(NacosConfigCache.getAdminUserInfo().getUserId().toString())) ){ // 鎸夌収瑙勫垯鎵�鏈夎�呮潵鏌ヨ conidtionMap.put("owner",AuthUtil.getUserId()); @@ -170,8 +167,8 @@ public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO)throws VciBaseException { LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query() .lambda().eq(CodeRule::getId, codeRuleDTO.getId()); - if(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())){ - wrapper.eq(CodeRule::getTenantId,codeRuleDTO.getTenantId()); + if(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){ + wrapper.eq(CodeRule::getTenantId,AuthUtil.getTenantId()); } // 鏍规嵁瑙勫垯id鏌ヨ缂栧彿 List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(wrapper); -- Gitblit v1.9.3