diff --git a/backend/src/main/java/com/ipsos/plugins/xpack/mapper/dept/XpackExtDeptMapper.xml b/backend/src/main/java/com/ipsos/plugins/xpack/mapper/dept/XpackExtDeptMapper.xml index 8186c48..8d653cf 100644 --- a/backend/src/main/java/com/ipsos/plugins/xpack/mapper/dept/XpackExtDeptMapper.xml +++ b/backend/src/main/java/com/ipsos/plugins/xpack/mapper/dept/XpackExtDeptMapper.xml @@ -1,12 +1,39 @@ - - + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + @@ -14,7 +41,7 @@ diff --git a/frontend/src/api/system/sysAuth.js b/frontend/src/api/system/sysAuth.js index cc26f4b..0e7ab22 100644 --- a/frontend/src/api/system/sysAuth.js +++ b/frontend/src/api/system/sysAuth.js @@ -10,14 +10,14 @@ export function post(url, data) { } export function authChange(data) { return request({ - url: '/api/sys_auth/authChange', + url: '/plugin/auth/authChange', data: data, method: 'post' }) } export function authDetails(data) { return request({ - url: '/api/sys_auth/authDetails', + url: '/plugin/auth/authDetails', data: data, method: 'post' }) @@ -25,9 +25,13 @@ export function authDetails(data) { export function authDetailsModel(authType) { return request({ - url: '/api/sys_auth/authDetailsModel/' + authType, + url: '/plugin/auth/authDetailsModel/' + authType, method: 'get' }) + // return request({ + // url: '/api/sys_auth/authDetailsModel/' + authType, + // method: 'get' + // }) } export function authModel(data) { diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml index 5ad7e7e..2061d04 100644 --- a/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml @@ -1,7 +1,6 @@ - @@ -31,5 +30,4 @@ -