合并分支 'dev' 到 'master'

Dev合并到master

查看合并请求 !16

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/resources/application-%APP_PKGPATH%-prod.yml.ftl

@@ -57,6 +57,10 @@ zuul:
       path: /v7/login
       serviceId: ibzuaa-api
       stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ibzuaa-api
+      stripPrefix: false
     uaa:
       path: /uaa/**
       serviceId: ibzuaa-api

SLN/%PUBPRJ%-boot/src/main/resources/application-dev.yml.ftl

@@ -69,6 +69,10 @@ zuul:
         path: /v7/login
         serviceId: ibzuaa-api
         stripPrefix: false
+      changepwd:
+        path: /v7/changepwd
+        serviceId: ibzuaa-api
+        stripPrefix: false
       uaa:
         path: /uaa/**
         serviceId: ibzuaa-api

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -619,9 +619,9 @@ public class ${itemCodeName}Resource {
 </#if>
 </#if>
 
-<#comment>数据查询Security权限校验</#comment>
+<#comment>数据查询Security权限校验（分组不鉴权）</#comment>
 <#macro DataQuerySecurityAnnotation dataset>
-    <#if de.getStorageMode()==1 || de.getStorageMode()==2>
+    <#if (de.getStorageMode()==1 || de.getStorageMode()==2 ) && dataset.isEnableGroup()==false>
         <#if hasDEPrefield==false>
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-search${dataset.codeName}-all')")
         <#else>