Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -1439,13 +1439,20 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		if (one == null){
 			throw new ServiceException("未找到当前项目首节点");
 		}
-		Long userId = AuthUtil.getUserId();
-		//判断是否存在当前专家id
-		if (StringUtil.isNotBlank(one.getExpertId()) && one.getExpertId().contains(userId+"")){
-			return false;
+		BladeUser user = AuthUtil.getUser();
+		String roleId = user.getRoleId();
+		//判断当前用户是否为专家
+		if (roleId.contains("1656191696348082177") || roleId.contains("1656191770880864257")){
+			//判断是否存在当前专家id
+			if (StringUtil.isNotBlank(one.getExpertId()) && one.getExpertId().contains(user.getUserId()+"")){
+				return false;
+			}else {
+				return true;
+			}
 		}else {
-			return true;
+			throw new ServiceException("当前用户不是专家，不能抽检");
 		}
+
 	}