Merge branch 'refs/heads/develop_rayson' into permission

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

@@ -21,21 +21,21 @@ public class DataPermissionConfiguration {
     public CustomDataPermissionRuleCustomizer customDataPermissionRuleCustomizer() {
         return rule -> {
 
-            // 招聘职位表 where enterprise_id = xx and user_id = xx
-            rule.addDataColumn(JobAdvertisedDO.class);
-            rule.addUserColumn(JobAdvertisedDO.class);
-
-            // 简历投递表 where  enterprise_id = xx and publish_user_id = xx
-            rule.addDataColumn(JobCvRelDO.class);
-            rule.addUserColumn(JobCvRelDO.class, "publish_user_id");
-
-            // 面试邀约表 where enterprise_id = xx and invite_user_id = xx
-            rule.addDataColumn(InterviewInviteDO.class);
-            rule.addUserColumn(InterviewInviteDO.class, "invite_user_id");
-
-            // 交易订单表 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(JobAdvertisedDO.class);
+//            rule.addUserColumn(JobAdvertisedDO.class);
+//
+//            // 简历投递表 where  enterprise_id = xx and publish_user_id = xx
+//            rule.addDataColumn(JobCvRelDO.class);
+//            rule.addUserColumn(JobCvRelDO.class, "publish_user_id");
+//
+//            // 面试邀约表 where enterprise_id = xx and invite_user_id = xx
+//            rule.addDataColumn(InterviewInviteDO.class);
+//            rule.addUserColumn(InterviewInviteDO.class, "invite_user_id");
+//
+//            // 交易订单表 where enterprise_id = xx and invite_user_id = xx
+//            rule.addDataColumn(TradeOrderDO.class);
+//            rule.addUserColumn(TradeOrderDO.class);
         };
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/task/SalaryReportEmailSendTask.java

@@ -29,7 +29,7 @@ public class SalaryReportEmailSendTask {
     private TaskSalaryReportMapper taskSalaryReportMapper;
 
     @TenantJob
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void execute() {
         log.info("SalaryReportEmailSendTask execute");
 //        messageUtils.sendMailAndFile(packSalaryReportTemplate("1142033484@qq.com",