From 07dc56d98bddb53d921e9982ea3047a624e4f737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Wed, 24 Nov 2021 17:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xpack/mapper/dept/XpackExtDeptMapper.xml  | 33 +++++++++++++++++--
 frontend/src/api/system/sysAuth.js            | 10 ++++--
 .../com/ipsos/common/mapper/PluginGridSql.xml |  2 --
 3 files changed, 37 insertions(+), 8 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ipsos.plugins.xpack.mapper.dept.XpackExtDeptMapper">
-
     <resultMap id="simpleNode" type="com.ipsos.common.dto.PluginSimpleTreeNode">
         <id property="id" column="id" javaType="java.lang.Long" />
         <result property="pid" column="pid" javaType="java.lang.Long"/>
     </resultMap>
-
+    <sql id="gridCondition">
+        <where>
+            <foreach collection="oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
+            </foreach>
+        </where>
+    </sql>
     <select id="allNodes" resultMap="simpleNode">
         select dept_id as id, pid from sys_dept
     </select>
@@ -14,7 +41,7 @@
 
     <select id="nodesByExample" parameterType="com.ipsos.common.entity.XpackGridExample" resultMap="simpleNode">
         select dept_id as id, pid from sys_dept
-        <include refid="com.ipsos.common.mapper.PluginGridSql.gridCondition" />
+        <include refid="gridCondition" />
     </select>
 
 
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ipsos.common.mapper.PluginGridSql">
-
     <sql id="gridCondition">
         <where>
             <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -31,5 +30,4 @@
             </foreach>
         </where>
     </sql>
-
 </mapper>