From 5acf9960559dde3d65ed24e91ca2804260883179 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 4 Jan 2022 17:32:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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}
 		</if>
 		<if test="record.mode != null">
-			and v_auth_model.`mode` = #{record.mode,jdbcType=BIGINT}
+	  		<if test="record.mode == 0">
+				and v_auth_model.`mode` = 0
+			</if>
+			<if test='record.mode == 1 and record.modelType != null and record.modelType == "dataset"'>
+				and (v_auth_model.`mode` = 1 or (v_auth_model.`model_inner_type` = 'group' and v_auth_model.model_type = 'dataset'))
+			</if>
 		</if>
 		<if test="record.dataSourceId != null">
 			and v_auth_model.data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}

From ad936cd96329931dc006550cbeaae664b906d728 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jan 2022 17:50:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=91=A8=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/job/sechedule/strategy/TaskHandler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
     }