Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java

@@ -11,4 +11,8 @@ public class ListOpePermsFormDTO {
     private String staffId;
     @NotBlank(message = "当前单位不能为空")
     private String currAgencyId;
+
+    private String currGridId;
+
+    private String currDeptId;
 }

epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.26
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.27
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.26</version>
+    <version>0.3.27</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -546,8 +546,7 @@ public class AccessServiceImpl implements AccessService {
             }
 
             if (!opeScope.getSeries().equals(OperationScopeConstant.SERIES_ORG_LEVEL)) {
-                // 如果不是org_level系列权限，跳过。(如果一个操作没有分配org_level系列权限，那么无法根据所在机构判断是否具有该功能权限)
-                // 此时不会给前台返回此功能权限。即要求所有操作必须分配至少一个org_level系列权限(如果实在不需要，可以分配成org_all)。
+                opeKeys.add(opeScope.getOperationKey());
                 continue;
             }
 

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -27,6 +27,7 @@ public class AccessServiceImpl implements AccessService {
         ListOpePermsFormDTO listOpePermsFormDTO = new ListOpePermsFormDTO();
         listOpePermsFormDTO.setStaffId(staffId);
         listOpePermsFormDTO.setCurrAgencyId(currAgencyId);
+        listOpePermsFormDTO.setCurrGridId(currGridId);
         Result<Set<String>> result = govAccessFeignClient.listOperationPermissions(listOpePermsFormDTO);
         if (!result.success()) {
             logger.error("调用GovAccess服务查询功能权限列表失败，StaffId:{}，错误信息:{}", staffId, result.getMsg());

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.10
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.11
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.10</version>
+    <version>0.3.11</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>