diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml index d69c141a40..912b404ae0 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml @@ -81,7 +81,12 @@ and v_auth_model.`level` = #{record.level,jdbcType=BIGINT} - and v_auth_model.`mode` = #{record.mode,jdbcType=BIGINT} + + and v_auth_model.`mode` = 0 + + + and (v_auth_model.`mode` = 1 or (v_auth_model.`model_inner_type` = 'group' and v_auth_model.model_type = 'dataset')) + and v_auth_model.data_source_id = #{record.dataSourceId,jdbcType=VARCHAR} diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java index 4ec969cb64..c685930a17 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java @@ -79,7 +79,8 @@ public abstract class TaskHandler implements InitializingBean { private String getDayOfWeek(Calendar instance) { int index = instance.get(Calendar.DAY_OF_WEEK); - return week[index]; + index = (index + 1) % 7; + return String.valueOf(index); }