1、移除个别滑块背景图

2、增加角色新增状态的保存
3、增加图数据库没有接收到则忽略逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -61,8 +61,7 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
 
         // 连接企业人才库表
         query.innerJoin(EnterpriseTalentPoolDO.class, on ->
-                on.eq(EnterpriseTalentPoolDO::getEnterpriseId, enterpriseId)
-                        .eq(EnterpriseTalentPoolDO::getUserId, PersonInfoDO::getUserId)
+                       on.eq(EnterpriseTalentPoolDO::getUserId, PersonInfoDO::getUserId)
         );
 
         // 连接用户表设置vip条件

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/framework/datapermission/config/DataPermissionConfiguration.java

@@ -1,11 +1,11 @@
 package com.citu.module.menduner.system.framework.datapermission.config;
 
 import com.citu.module.menduner.system.config.permission.CustomDataPermissionRuleCustomizer;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseTalentPoolDO;
 import com.citu.module.menduner.system.dal.dataobject.interview.InterviewInviteDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
-import com.citu.module.menduner.system.dal.dataobject.permission.MdeRoleDO;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -36,6 +36,10 @@ public class DataPermissionConfiguration {
             // 交易订单表 where enterprise_id = xx and invite_user_id = xx
             rule.addDataColumn(TradeOrderDO.class);
             rule.addUserColumn(TradeOrderDO.class);
+
+            // 企业人才库表 where enterprise_id = xx and user_id = xx
+            rule.addDataColumn(EnterpriseTalentPoolDO.class);
+            rule.addUserColumn(EnterpriseTalentPoolDO.class);
         };
     }
 

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

@@ -1,14 +1,12 @@
 package com.citu.module.menduner.system.mq.consumer;
 
-import com.citu.framework.tenant.core.aop.TenantIgnore;
 import com.citu.module.menduner.system.api.python.GraphApi;
 import com.citu.module.menduner.system.api.python.GraphSendDTO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedRespVO;
-import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
-import com.citu.module.menduner.system.enums.sync.SyncConstants;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.apache.rocketmq.spring.core.RocketMQPushConsumerLifecycleListener;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -22,16 +20,21 @@ import javax.annotation.Resource;
         topic = GraphSendDTO.SYNC_GRAPH_TOPIC,
         consumerGroup = GraphSendDTO.SYNC_GRAPH_TOPIC + "_CONSUMER"
 )
-public class GraphConsumer implements RocketMQListener<GraphSendDTO> {
+public class GraphConsumer implements RocketMQListener<GraphSendDTO>, RocketMQPushConsumerLifecycleListener {
 
     @Resource
     private GraphApi graphApi;
 
     @Override
-    public  void onMessage(GraphSendDTO message) {
+    public void onMessage(GraphSendDTO message) {
         log.info("GraphConsumer-接收到队列消息[{}]", message);
-        graphApi.send(message).getCheckedData();
+        graphApi.send(message);
         log.info("GraphConsumer-消息处理完备[{}]", message);
     }
 
+    @Override
+    public void prepareStart(DefaultMQPushConsumer consumer) {
+        // 不重试
+        consumer.setMaxReconsumeTimes(0);
+    }
 }

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

@@ -66,8 +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()))
-                .setStatus(MendunerStatusEnum.ENABLE.getStatus())
-                .setDataScope(MdeDataScopeEnum.ALL.getScope()); // 默认可查看所有数据。原因是，可能一些项目不需要项目权限
+                .setDataScope(MdeDataScopeEnum.ENTERPRISE_ONLY.getScope()); // 默认可查看当前企业权限
         roleMapper.insert(role);
 
         // 3. 记录操作日志上下文