Pārlūkot izejas kodu

同步-同步合同段-同步标识
1、添加权限控制,超级管理员才能看见标识

LHB 1 mēnesi atpakaļ
vecāks
revīzija
5fea7ba56d

+ 12 - 9
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -15,6 +15,7 @@ import org.springblade.common.utils.BaiduApiUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -375,15 +376,17 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                     "inner join m_wbs_tree_contract b on a.p_key_id = b.p_key_id and b.is_deleted = 0 and b.is_buss_show != 2 " +
                     "where a.type = " + tableOwner + " and a.is_sync = 1 and a.is_deleted = 0 and a.contract_id = " + contractId;
             Set<String> syncPKeyIds = new HashSet<>();
-            List<String> strings = null;
-            try {
-                strings = jdbcTemplate.queryForList(contractExtendSql, String.class);
-            } catch (DataAccessException e) {
-                e.printStackTrace();
-                //TODO 暂时忽略错误
-            }
-            if(CollectionUtil.isNotEmpty(strings)){
-                strings.stream().filter(com.alibaba.nacos.common.utils.StringUtils::isNotEmpty).forEach(f -> syncPKeyIds.addAll(Arrays.asList(f.split(","))));
+            if(SecureUtil.isAdministrator()){
+                List<String> strings = null;
+                try {
+                    strings = jdbcTemplate.queryForList(contractExtendSql, String.class);
+                } catch (DataAccessException e) {
+                    e.printStackTrace();
+                    //TODO 暂时忽略错误
+                }
+                if(CollectionUtil.isNotEmpty(strings)){
+                    strings.stream().filter(com.alibaba.nacos.common.utils.StringUtils::isNotEmpty).forEach(f -> syncPKeyIds.addAll(Arrays.asList(f.split(","))));
+                }
             }
 
             if (contractInfo != null) {

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -45,6 +45,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.*;
@@ -614,7 +615,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 //            resultTabs.forEach(tab->tab.setFileName(info.getName()));
 //        }
         //同步标识
-        if (CollectionUtil.isNotEmpty(resultTabs)) {
+        if (CollectionUtil.isNotEmpty(resultTabs) && SecureUtil.isAdministrator()) {
             List<Long> collect1 = resultTabs.stream().map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
             List<Long> longs = null;
             try {

+ 1 - 1
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -764,7 +764,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
             Set<String> ids = new HashSet<>();
             List<String> strings = null;
-            if (StringUtil.isNotBlank(id)) {
+            if (StringUtil.isNotBlank(id) && SecureUtil.isAdministrator()) {
                 //查询当前节点的祖级路径和pkid
                 String s = "SELECT concat(ancestors_p_id,',',p_key_id) FROM m_wbs_tree_contract WHERE contract_id = " + contractId + " and id = " + id + " limit 1";
                 if(StringUtil.isNotBlank(contractIdRelation)){