diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
index 30f012fff583ec2deeca9033a46ae9ba5d5e9033..9f684315a8791d5cfdcecaf3e4c4cf68063d398b 100644
--- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/resource/ResourceListApi.java
@@ -26,7 +26,6 @@ import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityConfigVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityFieldMappingVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityVo;
-import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceInfo;
 import neatlogic.framework.cmdb.enums.group.GroupType;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.common.dto.BasePageVo;
@@ -80,7 +79,7 @@ public class ResourceListApi extends PrivateApiComponentBase {
 
     @Override
     public String getName() {
-        return "查询资源中心数据列表";
+        return "nmcarr.resourcelistapi.getname";
     }
 
     @Override
@@ -94,32 +93,31 @@ public class ResourceListApi extends PrivateApiComponentBase {
     }
 
     @Input({
-            @Param(name = "keyword", type = ApiParamType.STRING, xss = true, desc = "模糊搜索"),
-            @Param(name = "typeId", type = ApiParamType.LONG, desc = "类型id"),
-            @Param(name = "protocolIdList", type = ApiParamType.JSONARRAY, desc = "协议id列表"),
-            @Param(name = "stateIdList", type = ApiParamType.JSONARRAY, desc = "状态id列表"),
-            @Param(name = "vendorIdList", type = ApiParamType.JSONARRAY, desc = "厂商id列表"),
-            @Param(name = "envIdList", type = ApiParamType.JSONARRAY, desc = "环境id列表"),
-            @Param(name = "appSystemIdList", type = ApiParamType.JSONARRAY, desc = "应用系统id列表"),
-            @Param(name = "appModuleIdList", type = ApiParamType.JSONARRAY, desc = "应用模块id列表"),
-            @Param(name = "typeIdList", type = ApiParamType.JSONARRAY, desc = "资源类型id列表"),
-            @Param(name = "tagIdList", type = ApiParamType.JSONARRAY, desc = "标签id列表"),
-            @Param(name = "inspectStatusList", type = ApiParamType.JSONARRAY, desc = "巡检状态列表"),
-            @Param(name = "searchField", type = ApiParamType.STRING, desc = "批量搜索字段"),
-            @Param(name = "batchSearchList", type = ApiParamType.JSONARRAY, desc = "批量搜索值"),
-            @Param(name = "defaultValue", type = ApiParamType.JSONARRAY, desc = "用于回显的资源ID列表"),
-            @Param(name = "cmdbGroupType", type = ApiParamType.STRING, desc = "通过团体过滤权限"),
-            @Param(name = "currentPage", type = ApiParamType.INTEGER, desc = "当前页"),
-            @Param(name = "pageSize", type = ApiParamType.INTEGER, desc = "每页数据条目"),
-            @Param(name = "needPage", type = ApiParamType.BOOLEAN, desc = "是否需要分页，默认true")
+            @Param(name = "keyword", type = ApiParamType.STRING, xss = true, desc = "common.keyword"),
+            @Param(name = "typeId", type = ApiParamType.LONG, desc = "common.typeid"),
+            @Param(name = "protocolIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.protocolidlist"),
+            @Param(name = "stateIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.stateidlist"),
+            @Param(name = "vendorIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.vendoridlist"),
+            @Param(name = "envIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.envidlist"),
+            @Param(name = "appSystemIdList", type = ApiParamType.JSONARRAY, desc = "term.appsystemidlist"),
+            @Param(name = "appModuleIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.appmoduleidlist"),
+            @Param(name = "typeIdList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.typeidlist"),
+            @Param(name = "tagIdList", type = ApiParamType.JSONARRAY, desc = "common.tagidlist"),
+            @Param(name = "inspectStatusList", type = ApiParamType.JSONARRAY, desc = "term.inspect.inspectstatuslist"),
+            @Param(name = "searchField", type = ApiParamType.STRING, desc = "term.cmdb.searchfield"),
+            @Param(name = "batchSearchList", type = ApiParamType.JSONARRAY, desc = "term.cmdb.batchsearchlist"),
+            @Param(name = "defaultValue", type = ApiParamType.JSONARRAY, desc = "common.defaultvalue"),
+            @Param(name = "cmdbGroupType", type = ApiParamType.STRING, desc = "term.cmdb.cmdbgrouptype"),
+            @Param(name = "currentPage", type = ApiParamType.INTEGER, desc = "common.currentpage"),
+            @Param(name = "pageSize", type = ApiParamType.INTEGER, desc = "common.pagesize"),
+            @Param(name = "rowNum", type = ApiParamType.INTEGER, desc = "common.rownum"),
+            @Param(name = "needPage", type = ApiParamType.BOOLEAN, desc = "common.isneedpage")
     })
     @Output({
             @Param(explode = BasePageVo.class),
-            @Param(name = "tbodyList", explode = ResourceVo[].class, desc = "数据列表"),
-            @Param(name = "errorList", explode = ResourceEntityVo[].class, desc = "数据初始化配置异常信息列表"),
-            @Param(name = "unavailableResourceInfoList", explode = ResourceInfo[].class, desc = "数据初始化配置异常信息列表")
+            @Param(name = "tbodyList", explode = ResourceVo[].class, desc = "common.tbodylist")
     })
-    @Description(desc = "查询资源中心数据列表")
+    @Description(desc = "nmcarr.resourcelistapi.getname")
     @Override
     public Object myDoService(JSONObject jsonObj) throws Exception {
         List<ResourceVo> resourceList = new ArrayList<>();
@@ -168,11 +166,18 @@ public class ResourceListApi extends PrivateApiComponentBase {
                 }
             }
         }
-        int rowNum = resourceMapper.getResourceCount(searchVo);
-        if (rowNum == 0) {
-            return TableResultUtil.getResult(resourceList, searchVo);
+        if (Objects.equals(searchVo.getRowNum(), 0)) {
+            int rowNum = 0;
+            if (noFilterCondition(searchVo)) {
+                rowNum = resourceMapper.getAllResourceCount(searchVo);
+            } else {
+                rowNum = resourceMapper.getResourceCount(searchVo);
+            }
+            if (rowNum == 0) {
+                return TableResultUtil.getResult(resourceList, searchVo);
+            }
+            searchVo.setRowNum(rowNum);
         }
-        searchVo.setRowNum(rowNum);
         if (StringUtils.isNotBlank(searchVo.getKeyword())) {
             int ipKeywordCount = resourceMapper.getResourceCountByIpKeyword(searchVo);
             if (ipKeywordCount > 0) {
@@ -241,4 +246,49 @@ public class ResourceListApi extends PrivateApiComponentBase {
         return TableResultUtil.getResult(resultList, searchVo);
     }
 
+    /**
+     * 判断是否有过滤条件
+     * @param searchVo
+     * @return
+     */
+    private boolean noFilterCondition(ResourceSearchVo searchVo) {
+        if (CollectionUtils.isNotEmpty(searchVo.getStateIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getVendorIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getEnvIdList())) {
+            return false;
+        }
+        if (searchVo.getExistNoEnv()) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getAppSystemIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getAppModuleIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getDefaultValue())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getInspectStatusList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getProtocolIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getTagIdList())) {
+            return false;
+        }
+        if (CollectionUtils.isNotEmpty(searchVo.getInspectJobPhaseNodeStatusList())) {
+            return false;
+        }
+        return true;
+    }
+
 }
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java
index 3f33ba30ae32c9dd743fe522a3813ef9c103636b..2dd6b5ce8b05fc4ce580c5a08f23f4c2fc67f4c5 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.java
@@ -36,6 +36,8 @@ public interface ResourceMapper extends IResourceCrossoverMapper {
 
     int getResourceCount(ResourceSearchVo searchVo);
 
+    int getAllResourceCount(ResourceSearchVo searchVo);
+
     int getResourceCountByDynamicCondition(@Param("searchVo") ResourceSearchVo searchVo, @Param("conditionSql") String conditionSql);
 
     List<Long> getResourceIdList(ResourceSearchVo searchVo);
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index bf234c26e41be34321b1c6427341290caf9fd0b8..fb1bb719038c9ce6f6ea71b80c3d330f7f7ecc8a 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -166,9 +166,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             resultType="int">
         SELECT COUNT(DISTINCT a.`id`)
         FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a
-        LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
-        LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
-        LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        <if test="protocolIdList != null and protocolIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
+            LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
+        </if>
+        <if test="tagIdList != null and tagIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        </if>
         <if test="isHasAuth == false">
             LEFT JOIN cmdb_cientity_group ccg ON ccg.cientity_id = a.id
             LEFT JOIN cmdb_group_auth cga ON ccg.group_id = cga.group_id
@@ -201,9 +205,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             resultType="int">
         SELECT COUNT(DISTINCT a.`id`)
         FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a
-        LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
-        LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
-        LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        <if test="protocolIdList != null and protocolIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
+            LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
+        </if>
+        <if test="tagIdList != null and tagIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        </if>
         <if test="isHasAuth == false">
             LEFT JOIN cmdb_cientity_group ccg ON ccg.cientity_id = a.id
             LEFT JOIN cmdb_group_auth cga ON ccg.group_id = cga.group_id
@@ -235,9 +243,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             resultType="int">
         SELECT COUNT(DISTINCT a.`id`)
         FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a
-        LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
-        LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
-        LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        <if test="protocolIdList != null and protocolIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
+            LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
+        </if>
+        <if test="tagIdList != null and tagIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        </if>
         <if test="inspectJobPhaseNodeStatusList !=null and inspectJobPhaseNodeStatusList.size() > 0">
             left join autoexec_job_resource_inspect ajri on ajri.resource_id=a.id
             left join autoexec_job_phase_node ajpn on ajpn.job_phase_id =ajri.phase_id AND ajpn.resource_id = a.id
@@ -288,14 +300,109 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </where>
     </select>
 
+    <select id="getAllResourceCount" parameterType="neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo"
+            resultType="int">
+        SELECT
+        <if test="isHasAuth == true">
+            COUNT(1)
+        </if>
+        <if test="isHasAuth == false">
+            COUNT(DISTINCT a.`id`)
+        </if>
+        FROM `cmdb_cientity` a
+        LEFT JOIN `cmdb_cientity_expiredtime` `ex` ON `ex`.`cientity_id` = `a`.`id`
+        <if test="isHasAuth == false">
+            LEFT JOIN cmdb_cientity_group ccg ON ccg.cientity_id = a.id
+            LEFT JOIN cmdb_group_auth cga ON ccg.group_id = cga.group_id
+            <choose>
+                <when test="cmdbGroupType == 'autoexec'">
+                    LEFT JOIN cmdb_group cg ON cga.group_id = cg.id AND cg.type in ('autoexec')
+                </when>
+                <otherwise>
+                    LEFT JOIN cmdb_group cg ON cga.group_id = cg.id AND cg.type in ('readonly','maintain','autoexec')
+                </otherwise>
+            </choose>
+        </if>
+        WHERE (`ex`.`cientity_id` IS NULL OR `ex`.`expired_time` >= NOW())
+        <if test="typeIdList != null and typeIdList.size() > 0">
+            <if test="isHasAuth == true">
+                AND a.`ci_id` IN
+                <foreach collection="typeIdList" item="typeId" open="(" separator="," close=")">
+                    #{typeId}
+                </foreach>
+            </if>
+            <if test="isHasAuth == false">
+                AND (
+                <choose>
+                    <when test="authedTypeIdList != null and authedTypeIdList.size() >0">
+                        a.`ci_id` IN
+                        <foreach collection="authedTypeIdList" item="authedTypeId" open="(" separator="," close=")">
+                            #{authedTypeId}
+                        </foreach>
+                    </when>
+                    <otherwise>
+                        1 = 0
+                    </otherwise>
+                </choose>
+                or (
+                cg.id  is not null and
+                a.`ci_id` IN
+                <foreach collection="typeIdList" item="typeId" open="(" separator="," close=")">
+                    #{typeId}
+                </foreach>
+                and
+                ((cga.auth_type = 'common' AND cga.auth_uuid = 'alluser')
+                <if test="authenticationInfo.userUuid != null and authenticationInfo.userUuid != ''">
+                    OR (
+                    cga.auth_type = 'user'
+                    AND
+                    cga.auth_uuid = #{authenticationInfo.userUuid}
+                    )
+                </if>
+                <if test="authenticationInfo.teamUuidList != null and authenticationInfo.teamUuidList.size() > 0">
+                    OR (
+                    cga.auth_type = 'team'
+                    AND
+                    cga.auth_uuid IN
+                    <foreach collection="authenticationInfo.teamUuidList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                    )
+                </if>
+                <if test="authenticationInfo.roleUuidList != null and authenticationInfo.roleUuidList.size() > 0">
+                    OR (
+                    cga.auth_type = 'role'
+                    AND
+                    cga.auth_uuid IN
+                    <foreach collection="authenticationInfo.roleUuidList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>)
+                </if>
+                )
+                )
+                )
+            </if>
+        </if>
+    </select>
+
     <select id="getResourceIdList" parameterType="neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo"
             resultType="java.lang.Long">
         SELECT m.`id` FROM (
-        SELECT DISTINCT a.`id`, a.`name`, a.`ip`
+        SELECT DISTINCT a.`id`
+        <if test="isNameFieldSort != null and isNameFieldSort == 1">
+            , a.`name`
+        </if>
+        <if test="isIpFieldSort != null and isIpFieldSort == 1">
+            , a.`ip`
+        </if>
         FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a
-        LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
-        LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
-        LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        <if test="protocolIdList != null and protocolIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
+            LEFT JOIN `cmdb_resourcecenter_account` c ON c.`id` = b.`account_id`
+        </if>
+        <if test="tagIdList != null and tagIdList.size() > 0">
+            LEFT JOIN `cmdb_resourcecenter_resource_tag` d ON d.`resource_id` = a.`id`
+        </if>
         <if test="inspectJobPhaseNodeStatusList !=null and inspectJobPhaseNodeStatusList.size() > 0">
             left join autoexec_job_resource_inspect ajri on ajri.resource_id=a.id
             left join autoexec_job_phase_node ajpn on ajpn.job_phase_id =ajri.phase_id AND ajpn.resource_id = a.id