Merge branch 'wxz_permission_fix' into release_temp

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

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

@@ -477,6 +477,7 @@ public class AccessServiceImpl implements AccessService {
 
         CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
         if (currAgencyDto == null || currAgencyDto.getId() == null) {
+            logger.warn(String.format("根据组织ID:{}未找到组织信息，返回空权限列表", currAgencyId));
             return filtedOps;
             //throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
         }