diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppModuleEnvAutoConfigInstanceApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppModuleEnvAutoConfigInstanceApi.java
index 47cd794420b7edaee17f59f9f149c4e02cf68ef4..d8a085644d3c7a63673956c31b1b9a7b4a3429e8 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppModuleEnvAutoConfigInstanceApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppModuleEnvAutoConfigInstanceApi.java
@@ -58,6 +58,7 @@ public class SearchDeployAppModuleEnvAutoConfigInstanceApi extends PrivateApiCom
             @Param(name = "appModuleId", type = ApiParamType.LONG, isRequired = true, desc = "模块 id"),
             @Param(name = "envId", type = ApiParamType.LONG, isRequired = true, desc = "环境 id"),
             @Param(name = "isAutoConfig", type = ApiParamType.INTEGER, desc = "是否有AutoConfig"),
+            @Param(name = "defaultValue", type = ApiParamType.JSONARRAY, desc = "默认值"),
             @Param(name = "currentPage", type = ApiParamType.INTEGER, desc = "当前页"),
             @Param(name = "pageSize", type = ApiParamType.INTEGER, desc = "每页数据条目"),
             @Param(name = "needPage", type = ApiParamType.BOOLEAN, desc = "是否需要分页，默认true")
diff --git a/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java b/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
index eaeb732e55605923336ec5364b605526e321e183..fada341f842535ef8b7826d464c5d0624fdb2397 100644
--- a/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
@@ -104,23 +104,23 @@ public class ListDeployScheduleApi extends PrivateApiComponentBase {
         int rowNum = deployScheduleMapper.getScheduleCount(searchVo);
         if (rowNum > 0) {
             searchVo.setRowNum(rowNum);
-            if (searchVo.getCurrentPage() <= searchVo.getPageCount()) {
-                IAppSystemMapper appSystemMapper = CrossoverServiceFactory.getApi(IAppSystemMapper.class);
-                tbodyList = deployScheduleMapper.getScheduleList(searchVo);
-                List<Long> idList = tbodyList.stream().map(DeployScheduleVo::getId).collect(Collectors.toList());
+            IAppSystemMapper appSystemMapper = CrossoverServiceFactory.getApi(IAppSystemMapper.class);
+            List<Long> idList = deployScheduleMapper.getScheduleIdList(searchVo);
+            if (CollectionUtils.isNotEmpty(idList)) {
+                tbodyList = deployScheduleMapper.getScheduleListByIdList(idList);
                 List<DeployScheduleVo> scheduleAuditCountList = deployScheduleMapper.getScheduleAuditCountListByIdList(idList);
-                Map<Long, DeployScheduleVo> scheduleMap = scheduleAuditCountList.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
+                Map<Long, DeployScheduleVo> scheduleMap = scheduleAuditCountList.stream().collect(Collectors.toMap(DeployScheduleVo::getId, e -> e));
                 Map<Long, AppSystemVo> appSystemMap = new HashMap<>();
                 List<Long> appSystemIdList = tbodyList.stream().map(DeployScheduleVo::getAppSystemId).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(appSystemIdList)) {
                     List<AppSystemVo> appSystemList = appSystemMapper.getAppSystemListByIdList(appSystemIdList);
-                    appSystemMap = appSystemList.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
+                    appSystemMap = appSystemList.stream().collect(Collectors.toMap(AppSystemVo::getId, e -> e));
                 }
                 Map<Long, AppModuleVo> appModuleMap = new HashMap<>();
                 List<Long> appModuleIdList = tbodyList.stream().map(DeployScheduleVo::getAppModuleId).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(appModuleIdList)) {
                     List<AppModuleVo> appModuleList = appSystemMapper.getAppModuleListByIdList(appModuleIdList);
-                    appModuleMap = appModuleList.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
+                    appModuleMap = appModuleList.stream().collect(Collectors.toMap(AppModuleVo::getId, e -> e));
                 }
                 List<Long> pipelineIdList = tbodyList.stream().map(DeployScheduleVo::getPipelineId).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(pipelineIdList)) {
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
index 38d4f728e0e03ca86d8c904975016a20f7dd98b3..ee01bf36d8016eb061290986a38b218b9df62a03 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
@@ -940,7 +940,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                     #{item}
                 </foreach>
             </if>
-            <include refid="checkDeployAuthority"/>
+            <if test="isHasAllAuthority == 0">
+                AND
+                <include refid="checkDeployAuthority"/>
+            </if>
             <choose>
                 <when test="isConfig != null and isConfig == 1">
                     and b.`config` is not NULL
@@ -963,32 +966,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
     </select>
 
     <sql id="checkDeployAuthority">
-        <if test="isHasAllAuthority == 0">
-            AND
-            (daca.app_system_id is null
-            OR
-            (daca.action_type = 'operation'
-            AND daca.action IN
-            ('all'
-            <if test="authorityActionList != null and authorityActionList.size() > 0">,
-                <foreach collection="authorityActionList" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            )
-            AND daca.auth_uuid IN
-            (
-            'alluser'
-            <if test="authUuidList != null and authUuidList.size() > 0">
-                ,
-                <foreach collection="authUuidList" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            )
-            )
-            )
+        (daca.app_system_id is null
+        OR
+        (daca.action_type = 'operation'
+        AND daca.action IN
+        ('all'
+        <if test="authorityActionList != null and authorityActionList.size() > 0">,
+            <foreach collection="authorityActionList" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
+        )
+        AND daca.auth_uuid IN
+        (
+        'alluser'
+        <if test="authUuidList != null and authUuidList.size() > 0">
+            ,
+            <foreach collection="authUuidList" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        )
+        )
+        )
     </sql>
 
     <select id="getCiEntityIdListCount" resultType="java.lang.Integer" useCache="false">
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
index 98bba391ded1f4f8b775c367dfd196ab0684caec..3d3d1e283444c31cf250b5c21a22ad75bc2297c1 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
@@ -224,8 +224,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </if>
             <if test="envId != null">
                 and (dj.`env_id` = #{envId} or djj.`env_id` = #{envId})
+            </if><if test="isHasAllAuthority == 0">
+                AND
+                <include refid="neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper.checkDeployAuthority"/>
             </if>
-            <include refid="neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper.checkDeployAuthority"/>
         </where>
     </sql>
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.java b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.java
index fffc1ee08e260e0616221ad6522d827a6555347e..0b7bd206dfbfaae7c54842bfb55d7945286b5af9 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.java
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.java
@@ -29,7 +29,7 @@ public interface DeployScheduleMapper {
 
     int getScheduleCount(DeployScheduleSearchVo searchVo);
 
-    List<DeployScheduleVo> getScheduleList(DeployScheduleSearchVo searchVo);
+    List<Long> getScheduleIdList(DeployScheduleSearchVo searchVo);
 
     List<DeployScheduleVo> getScheduleListByIdList(List<Long> idList);
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
index 0a777be04951faf941e83b9802d2148cb3a39332..f995082192472b1339dcc219b974028b9baee669 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
@@ -83,7 +83,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </if>
             <if test="isHasAllAuthority == 0">
             AND (a.`type` = 'pipeline'
-            OR daca.`app_system_id`
+            OR
             <include refid="neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper.checkDeployAuthority"/>
             )
             </if>
@@ -92,7 +92,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 
     <select id="getScheduleCount" parameterType="neatlogic.framework.deploy.dto.schedule.DeployScheduleSearchVo" resultType="int">
         SELECT
-            COUNT(1)
+            COUNT(DISTINCT a.`id`)
         FROM `deploy_schedule` a
         <if test="isHasAllAuthority == 0">
             LEFT JOIN `deploy_app_config_authority` daca ON daca.`app_system_id` = a.`app_system_id`
@@ -100,31 +100,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         <include refid="searchScheduleWhere"/>
     </select>
 
-    <select id="getScheduleList" parameterType="neatlogic.framework.deploy.dto.schedule.DeployScheduleSearchVo" resultType="neatlogic.framework.deploy.dto.schedule.DeployScheduleVo">
+    <select id="getScheduleIdList" parameterType="neatlogic.framework.deploy.dto.schedule.DeployScheduleSearchVo" resultType="java.lang.Long">
         SELECT
-        a.`id`,
-        a.`uuid`,
-        a.`name`,
-        a.`begin_time` AS beginTime,
-        a.`end_time` AS endTime,
-        a.`cron`,
-        a.`is_active` AS isActive,
-        a.`config` AS configStr,
-        a.`type`,
-        a.`fcd`,
-        a.`fcu`,
-        a.`lcd`,
-        a.`lcu`,
-        a.`app_system_id` AS appSystemId,
-        a.`app_module_id` AS appModuleId,
-        a.`pipeline_id` AS pipelineId,
-        a.`pipeline_type` AS pipelineType
+        DISTINCT a.`id`
         FROM `deploy_schedule` a
         <if test="isHasAllAuthority == 0">
             LEFT JOIN `deploy_app_config_authority` daca ON daca.`app_system_id` = a.`app_system_id`
         </if>
         <include refid="searchScheduleWhere"/>
-        ORDER BY a.`lcd`
+        ORDER BY a.`id`
         LIMIT #{startNum}, #{pageSize}
     </select>
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployVersionMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployVersionMapper.xml
index d191a631a08e229abfd1fc9dfe1852648a34bb96..81cd4a4cb0585de6c874bfd55e06d0f5216d3f80 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployVersionMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployVersionMapper.xml
@@ -150,7 +150,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                 dv.`fcd` &lt;= FROM_UNIXTIME(#{startTimeRange[1]})
                 )
             </if>
-            <include refid="neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper.checkDeployAuthority"/>
+            <if test="isHasAllAuthority == 0">
+                AND
+                <include refid="neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper.checkDeployAuthority"/>
+            </if>
         </where>
     </sql>
 
diff --git a/src/main/java/neatlogic/module/deploy/schedule/plugin/DeployJobScheduleJob.java b/src/main/java/neatlogic/module/deploy/schedule/plugin/DeployJobScheduleJob.java
index 7723a04342e6ec2198b346f8e14c4828159d1085..d21d7a6c1c8a860aa500563a619dd6b4848d4913 100644
--- a/src/main/java/neatlogic/module/deploy/schedule/plugin/DeployJobScheduleJob.java
+++ b/src/main/java/neatlogic/module/deploy/schedule/plugin/DeployJobScheduleJob.java
@@ -33,6 +33,7 @@ import neatlogic.module.deploy.dao.mapper.DeployPipelineMapper;
 import neatlogic.module.deploy.dao.mapper.DeployScheduleMapper;
 import neatlogic.module.deploy.service.DeployBatchJobService;
 import neatlogic.module.deploy.service.DeployJobService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.springframework.stereotype.Component;
@@ -98,12 +99,15 @@ public class DeployJobScheduleJob  extends JobBase {
             int pageCount = searchVo.getPageCount();
             for (int currentPage = 1; currentPage <= pageCount; currentPage++) {
                 searchVo.setCurrentPage(currentPage);
-                List<DeployScheduleVo> list = deployScheduleMapper.getScheduleList(searchVo);
-                for (DeployScheduleVo scheduleVo : list) {
-                    JobObject.Builder jobObjectBuilder = new JobObject
-                            .Builder(scheduleVo.getUuid(), this.getGroupName(), this.getClassName(), TenantContext.get().getTenantUuid());
-                    JobObject jobObject = jobObjectBuilder.build();
-                    this.reloadJob(jobObject);
+                List<Long> idList = deployScheduleMapper.getScheduleIdList(searchVo);
+                if (CollectionUtils.isNotEmpty(idList)) {
+                    List<DeployScheduleVo> list = deployScheduleMapper.getScheduleListByIdList(idList);
+                    for (DeployScheduleVo scheduleVo : list) {
+                        JobObject.Builder jobObjectBuilder = new JobObject
+                                .Builder(scheduleVo.getUuid(), this.getGroupName(), this.getClassName(), TenantContext.get().getTenantUuid());
+                        JobObject jobObject = jobObjectBuilder.build();
+                        this.reloadJob(jobObject);
+                    }
                 }
             }
         }