diff --git a/config/db/V7.4__create_policy_cloud_service.sql b/config/db/V7.4__create_policy_cloud_service.sql
new file mode 100644
index 00000000..9f40fe5a
--- /dev/null
+++ b/config/db/V7.4__create_policy_cloud_service.sql
@@ -0,0 +1,78 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for policy_cloud_service
+-- ----------------------------
+DROP TABLE IF EXISTS `policy_cloud_service`;
+CREATE TABLE `policy_cloud_service`  (
+  `service_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `service_item_tier1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `service_item_tier2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `service_description` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+  `specification` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `year` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of policy_cloud_service
+-- ----------------------------
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置1H4G', '1H4G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置1H4G', '1H4G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置2H4G', '2H4G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置2H8G', '2H8G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置2H16G', '2H16G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置4H8G', '4H8G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置4H16G', '4H16G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置4H32G', '4H32G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置8H16G', '8H16G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置8H32G', '8H32G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置8H64G', '8H64G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置16H32G', '16H32G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置16H64G', '16H64G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置32H64G', '32H64G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机', '云主机配置32H128G', '32H128G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机系统盘', '云主机系统盘', '40G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '云主机数据盘', '云主机数据盘', '100G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '非结构化数据对象存储服务', '非结构化数据对象存储服务', '100G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '数据异地容灾服务', '数据异地容灾服务', '100G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '主机服务', '数据本地备份及快速恢复服务', '数据本地备份及快速恢复服务', '100G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('基础服务', '机柜服务', '机柜租赁服务', '机柜租赁服务', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MySQL', '云数据库RDS for MySQL', '1200MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MySQL', '云数据库RDS for MySQL', '2400MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MySQL', '云数据库RDS for MySQL', '6000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MySQL', '云数据库RDS for MySQL', '12000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MSSQL Server', '云数据库RDS for MS SQL Server', '1000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MSSQL Server', '云数据库RDS for MS SQL Server', '12000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MSSQL Server', '云数据库RDS for MS SQL Server', '4000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MSSQL Server', '云数据库RDS for MS SQL Server', '6000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库RDS for MSSQL Server', '云数据库RDS for MS SQL Server', '12000MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '数据库', '云数据库数据盘', '云数据库数据盘', '100MB内存', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('PaaS服务', '负载均衡', '负载均衡服务', '负载均衡服务', '实例', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('安全服务', '主机数据库应用安全服务', '等保三级标准服务', '云主机安全服务-等保三级服务', '云主机', '必选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('安全服务', '主机数据库应用安全服务', '数据安全服务', '数据安全服务', '数据库实例', '必选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('安全服务', '主机数据库应用安全服务', '应用安全服务', '应用安全服务', '云主机', '必选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('运营服务', '增值服务', '同城应用容灾服务', '同城应用容灾服务', '云主机', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '数据分析服务', '数据分析服务', '数据分析服务数据离线计算', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '数据分析服务', '数据分析服务', '数据分析服务数据实时计算', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '数据分析服务', '数据分析服务', '数据分析服务数据同步服务', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '数据脱敏服务', '数据脱敏服务', '数据脱敏服务隐私数据发现', '套', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '数据脱敏服务', '数据脱敏服务', '数据脱敏服务隐私数据漂泊', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '大数据存储', '非结构化数据存储', '大数据存储服务非结构化数据存储', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('大数据服务', '大数据存储', '结构化数据存储', '大数据存储服务结构化数据存储', '1', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '商用操作系统套餐', 'Windows server 2008 、2012、2016数据中心版等安装、授权激活、维护', '云主机', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '商用操作系统套餐', 'Redhat 6.6以上不同版本系统安装和维护', '云主机', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '商用操作系统套餐', 'CentOS 6.5以上不同版本系统安装和维护', '云主机', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '桌面云基础套餐', '双核（1.6Ghz）/3G内存/40G系统盘/100G数据盘；6个USB口、1个VGA接口或1个HDMI接口，音频输入输出接口。支持1920*1200桌面分辨率。含瘦终端、分屏器、软件升级费用，不包含鼠标、键盘等外设费用', '个', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '桌面云基础套餐', '双核（1.6Ghz）/3G内存/40G系统盘/100G数据盘；6个USB口、1个VGA接口或1个HDMI接口，音频输入输出接口。支持1920*1200桌面分辨率。含瘦终端、分屏器、软件升级费用，不包含鼠标、键盘等外设费用', '个', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '桌面云标准套餐', '双核（2.0Ghz）/5G内存/40G系统盘/100G数据盘；6个USB口、1个VGA接口或1个HDMI接口，音频输入输出接口。支持1920*1200桌面分辨率。含瘦终端、分屏器、软件升级费用，不包含鼠标、键盘等外设费用', '个', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '桌面云高级套餐', '四核2.4GHz、8G内存/40G系统盘/100G数据盘；6个USB口、1个VGA接口和1个HDMI接口，音频输入输出接口。支持1920*1200桌面分辨率。含瘦终端、分屏器、软件升级费用，不包含鼠标、键盘等外设费用', '个', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '操作系统和其他中间件', '桌面云数据盘', '以100GB为单位', '100G', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '云安全保障增值服务', '信息系统二级等级保护测评服务', '按照国家公安部门等级保护制度要求提供物理安全、网络安全、主机安全、数据安全、应用安全等测评服务（二级）。本服务目录价格为省公安厅最低价。', '信息系统', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '云安全保障增值服务', '信息系统三级等级保护测评服务', '按照国家公安部门等级保护制度要求提供物理安全、网络安全、主机安全、数据安全、应用安全等测评服务（三级）。本服务目录价格为省公安厅最低价。', '信息系统', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '云安全保障增值服务', '网页防篡改服务', '增强版网页防篡改服务。', '云主机', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '云安全保障增值服务', '商用密码安全评估', '按照国家《密码安全法》对云平台或云主机做商用密码安全全量评估。最终出具业内标准的商密评估报告。', '系统', '可选', '2022');
+INSERT INTO `policy_cloud_service` VALUES ('附加增值服务', '云安全保障增值服务', '蜜罐服务', '融合网络欺骗和主动防御威胁检测防御系统,通过暗设陷阱,主动诱导攻击,能够动态感知内网攻击行为,及时精准的定位攻击源,并隐匿真实资产,保障业务系统的安全运行。', '套', '可选', '2022');
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/config/db/V7.4__new_table.sql b/config/db/V7.5__new_table.sql
similarity index 100%
rename from config/db/V7.4__new_table.sql
rename to config/db/V7.5__new_table.sql
diff --git a/config/db/V7.5__resource_add_col.sql b/config/db/V7.6__resource_add_col.sql
similarity index 100%
rename from config/db/V7.5__resource_add_col.sql
rename to config/db/V7.6__resource_add_col.sql
diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index cdec54b8..81cb72b6 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -19,6 +19,7 @@ import io.renren.modules.resourceBrowse.service.ResourceBrowseService;
 import io.renren.modules.security.user.SecurityUser;
 import io.renren.modules.security.user.UserDetail;
 import io.renren.modules.sys.dto.SysDeptDTO;
+import io.renren.modules.sys.enums.SuperAdminEnum;
 import io.renren.modules.sys.service.SysDeptService;
 import io.renren.modules.sys.service.SysUserService;
 import io.swagger.annotations.Api;
@@ -75,6 +76,8 @@ public class CensusController {
     @Value("${census.applyType}")
     private String[] censusApplyTypes; // 需要进行申请统计的资源类型
 
+    @Value("${big_date.name}")
+    private String bigDataDeptName;
 
     /**
      * 获取各类资源数目
@@ -479,19 +482,18 @@ public class CensusController {
     })
     public Result selectCensusResourceTable(@RequestParam Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
-        if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        //2022-11-21 修改为只有大数据局部门和admin账号能查看所有
+        if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) {
+
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
         }
-//        else if (SuperAdminEnum.YES.value() == user.getSuperAdmin()) { // 超级管理员
-//
-//        }
         return new Result().ok(resourceService.selectCensusResourceTable(params));
     }
 
     @GetMapping("/exportSelectCensusResourceTable")
-    @ApiOperation("查询部门上架资源及审批结果详细信息")
-    @LogOperation("查询部门上架资源及审批结果详细信息")
+    @ApiOperation("导出部门上架资源及审批结果详细信息")
+    @LogOperation("导出部门上架资源及审批结果详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType = "String"),
@@ -501,8 +503,10 @@ public class CensusController {
     })
     public void exportSelectCensusResourceTable(@RequestParam Map<String, Object> params, HttpServletResponse response) throws IOException {
         UserDetail user = SecurityUser.getUser();
-        if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        //2022-11-21 修改为只有大数据局部门和admin账号能查看所有
+        if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) {
+
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
         }
         ArrayList<Map> resultList = (ArrayList<Map>) resourceDao.selectCensusResourceTable(params);
@@ -560,13 +564,12 @@ public class CensusController {
     })
     public Result selectCensusApplyTable(@RequestParam Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
-        if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        //2022-11-21 修改为只有大数据局部门和admin账号能查看所有
+        if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) {
+
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
         }
-//        else if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) { // 超级管理员
-//
-//        }
         return new Result().ok(resourceService.selectCensusApplyTable(params));
     }
 
@@ -582,13 +585,12 @@ public class CensusController {
     })
     public void exportSelectCensusApplyTable(@RequestParam Map<String, Object> params, HttpServletResponse response) throws IOException {
         UserDetail user = SecurityUser.getUser();
-        if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
+        //2022-11-21 修改为只有大数据局部门和admin账号能查看所有
+        if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) {
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
         }
-//        else if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) { // 超级管理员
-//
-//        }
+
         ArrayList<Map> resultList = (ArrayList<Map>) resourceDao.selectCensusApplyTable(params);
         List<List<Object>> date = resultList.stream().map(index -> {
             List<Object> data = new ArrayList<>();
diff --git a/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java
index cc017413..4a96feda 100644
--- a/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java
@@ -271,12 +271,17 @@ public class SysNoticeServiceImpl extends CrudServiceImpl<SysNoticeDao, SysNotic
                 exchangeCodes.append(ywMobile + ";");
             }
         }
-        if (userNames.charAt(userNames.length() - 1) == ';') {
-            userNames.deleteCharAt(userNames.length() - 1);
+        if (userGuids.length() <= 0 || userNames.length() <= 0) {
+            logger.info("未找到亚伟用户guid，用户为{}", userNames);
+            return;
         }
         if (userGuids.charAt(userGuids.length() - 1) == ';') {
             userGuids.deleteCharAt(userGuids.length() - 1);
         }
+        if (userNames.charAt(userNames.length() - 1) == ';') {
+            userNames.deleteCharAt(userNames.length() - 1);
+        }
+
         if (exchangeCodes.charAt(exchangeCodes.length() - 1) == ';') {
             exchangeCodes.deleteCharAt(exchangeCodes.length() - 1);
         }
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 3c941356..fe54bf71 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -460,7 +460,7 @@ public class TAbilityApplicationController {
         return new Result().ok(tAbilityApplicationService.getApplyCameraList());
     }
 
-    @GetMapping("/delApplyCamera")
+    @PostMapping("/delApplyCamera")
     @ApiOperation("/西海岸-用户删除已申请摄像头")
     @LogOperation("/西海岸-用户删除已申请摄像头")
     public Result delApplyCamera(@RequestBody List<Long> ids) {
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
index 39083f5c..693d1f98 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
@@ -13,8 +13,10 @@ import io.renren.modules.security.user.UserDetail;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +31,8 @@ import java.util.stream.Collectors;
 @Service
 public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityApplicationDao, TAbilityApplicationEntity, TAbilityApplicationDTO> implements TAbilityApplicationService {
     private static final Logger logger = LoggerFactory.getLogger(TAbilityApplicationServiceImpl.class);
+
+    @Autowired
     private TAbilityApplicationDao abilityApplicationDao;
 
     @Override
@@ -145,7 +149,8 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
     public Object getApplyCameraList() {
         UserDetail userDetail = SecurityUser.getUser();
         String currentTime = DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN);
-        return abilityApplicationDao.getApplyCameraList(userDetail.getId(), currentTime);
+        List<Map> cameraList = abilityApplicationDao.getApplyCameraList(userDetail.getId(), currentTime);
+        return cameraList.isEmpty() ? new ArrayList<>() : cameraList;
     }
 
     @Override
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 3ca7a805..f1631dc0 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -159,6 +159,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Value("${zsk.catalogIds}")
     private String[] catalogIds;
 
+    @Value("${big_date.name}")
+    private String bigDataDeptName;
+
     @Autowired
     private ResourceDao resourceDao;
 
@@ -2129,10 +2132,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public Object selectApplyDeptDetailTypeCountList(Map params) {
         UserDetail user = SecurityUser.getUser();
-        if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) {
+        SysDeptDTO sysDeptDTO = deptService.get(user.getDeptId());
+        if (user.getSuperAdmin() == SuperAdminEnum.YES.value() || bigDataDeptName.equals(sysDeptDTO.getName())) {
             logger.info("管理员区域");
         } else if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = deptService.get(user.getDeptId());
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
             logger.error("区域管理员只出本部门区域：{}", sysDeptDTO.getDistrict());
         }
@@ -2314,10 +2317,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public Object selectDeptDetailTypeCountList(Map params) {
         UserDetail user = SecurityUser.getUser();
-        if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) {
+        SysDeptDTO sysDeptDTO = deptService.get(user.getDeptId());
+        if (user.getSuperAdmin() == SuperAdminEnum.YES.value() || bigDataDeptName.equals(sysDeptDTO.getName())) {
             logger.info("管理员区域");
         } else if (user.getDeptId() != null) {
-            SysDeptDTO sysDeptDTO = deptService.get(user.getDeptId());
             params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
             logger.error("区域管理员只出本部门区域：{}", sysDeptDTO.getDistrict());
         }
diff --git a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
index 5b2460e3..77f42c24 100644
--- a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
@@ -27,7 +27,8 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
     /**
      * 12小时后过期
      */
-    private final static int EXPIRE = 3600 * 12;
+    @Value("${system.tokenExpireTime}")
+    private int EXPIRE;
 
     @Value("${system.allowSimultaneousLogin}")
     private int allowSimultaneousLogin;
@@ -99,7 +100,7 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
         //当前时间
         Date now = new Date();
         //过期时间
-        Date expireTime = new Date(now.getTime() + EXPIRE * 1000);
+        Date expireTime = new Date(now.getTime() + EXPIRE * 3600000);
 
         //判断是否生成过token
         SysUserTokenEntity tokenEntity = baseDao.getByUserId(userId);
diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml
index 622f6540..b0b26859 100644
--- a/renren-admin/src/main/resources/application.yml
+++ b/renren-admin/src/main/resources/application.yml
@@ -125,6 +125,8 @@ system:
   resumeLogonTime: 2
   #允许账号多地同时登录: 0(不允许), 1(允许)
   allowSimultaneousLogin: 1
+  #token过期时间，单位小时
+  tokenExpireTime: 12
 
 yawei:
   enable: true
diff --git a/renren-admin/src/main/resources/db/V7.4__new_table.sql b/renren-admin/src/main/resources/db/V7.5__new_table.sql
similarity index 100%
rename from renren-admin/src/main/resources/db/V7.4__new_table.sql
rename to renren-admin/src/main/resources/db/V7.5__new_table.sql
diff --git a/renren-admin/src/main/resources/db/V7.5__resource_add_col.sql b/renren-admin/src/main/resources/db/V7.6__resource_add_col.sql
similarity index 100%
rename from renren-admin/src/main/resources/db/V7.5__resource_add_col.sql
rename to renren-admin/src/main/resources/db/V7.6__resource_add_col.sql
diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
index 723ae1c8..3829e074 100644
--- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
+++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
@@ -326,7 +326,7 @@
     </select>
 
     <select id="getApplyCameraList" resultType="java.util.Map">
-        SELECT id, camera_list AS "cameraInfo", approve_status AS "approveStatus"
+        SELECT id, camera_list AS "cameraInfo", approve_status AS "approveStatus", instance_id AS "instanceId"
         FROM t_ability_application taa
         WHERE 1 = 1
           AND del_flag = 0