Merge branch 'refs/heads/develop_rayson' into permission

# Conflicts:
#	menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/GraphConsumer.java
#	menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdeRoleServiceImpl.java

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/GraphConsumer.java

@@ -28,7 +28,7 @@ public class GraphConsumer implements RocketMQListener<GraphSendDTO>, RocketMQPu
     @Override
     public void onMessage(GraphSendDTO message) {
         log.info("GraphConsumer-接收到队列消息[{}]", message);
-        graphApi.send(message);
+        graphApi.send(message).getCheckedData();
         log.info("GraphConsumer-消息处理完备[{}]", message);
     }
 
@@ -37,4 +37,5 @@ public class GraphConsumer implements RocketMQListener<GraphSendDTO>, RocketMQPu
         // 不重试
         consumer.setMaxReconsumeTimes(0);
     }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdeRoleServiceImpl.java

@@ -66,7 +66,7 @@ public class MdeRoleServiceImpl implements MdeRoleService {
         MdeRoleDO role = BeanUtils.toBean(createReqVO, MdeRoleDO.class)
                 .setEnterpriseId(LoginUserContext.getEnterpriseId())
                 .setType(ObjectUtil.defaultIfNull(type, MdeRoleTypeEnum.CUSTOM.getType().toString()))
-                .setDataScope(MdeDataScopeEnum.ENTERPRISE_ONLY.getScope()); // 默认可查看当前企业权限
+                .setDataScope(MdeDataScopeEnum.ALL.getScope()); // 默认可查看所有数据。原因是，可能一些项目不需要项目权限
         roleMapper.insert(role);
 
         // 3. 记录操作日志上下文