From e07922d3b2501465e38e9fb4d9d318911f03acd9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 29 Dec 2022 14:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E7=BC=BA=E6=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/auth/AuthAdminDao.xml      | 60 ++++++++++++++++++-
 .../resources/mybatis/mapper/auth/DeptDao.xml | 13 +++-
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
index f5f3aca0..8b43ebbc 100644
--- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
@@ -120,7 +120,8 @@
         #{CustomerId},
         #{locInvCode},
         #{locSubInvCode},
-        #{dept},#{comments}
+        #{dept},
+        #{comments}
         )
     </insert>
 
@@ -153,4 +154,61 @@
         from auth_user
         where userFlag != 0
     </select>
+
+
+    <select id="selectNotSelectUser" resultType="com.glxp.api.entity.auth.AuthAdmin">
+        select *
+        from auth_user
+
+        <where>
+            userFlag != 0
+            <if test="userIds != null and userIds.size()!=0">
+                and id not in
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+
+    <select id="selectAllocatedList" parameterType="com.glxp.api.req.auth.AuthAdminQueryRequest"
+            resultType="com.glxp.api.entity.auth.AuthAdmin">
+        select u.*
+        from auth_user u
+        left join sys_user_role sur on u.id = sur.user_id
+        left join sys_role r on r.role_id = sur.role_id
+        <where>
+            <if test="roleId != null and '' != roleId">
+                AND r.role_id =#{roleId}
+            </if>
+        </where>
+
+    </select>
+
+
+    <select id="selectUnallocatedList" parameterType="com.glxp.api.req.auth.AuthAdminQueryRequest"
+            resultType="com.glxp.api.entity.auth.AuthAdmin">
+        select u.*
+        from auth_user u
+        left join sys_user_role sur on u.id = sur.user_id
+        left join sys_role r on r.role_id = sur.role_id
+        <where>
+            <if test="ids!=null and ids.size()!=0">
+                u.id not in
+                <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="roleId != null and '' != roleId">
+                AND r.role_id  <![CDATA[ <> ]]> #{roleId}
+            </if>
+            <if test="userName != null and '' != userName">
+                AND u.user_name LIKE concat('%', #{userName}, '%')
+            </if>
+        </where>
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml
index 55c39264..40273651 100644
--- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml
@@ -8,9 +8,15 @@
         SELECT *
         FROM auth_dept
         <where>
-            <if test="flag != null and flag != ''">
+            <if test="id != null ">
+                and id = #{id}
+            </if>
+            <if test="flag != null ">
                 and flag = #{flag}
             </if>
+            <if test="parentId != null and parentId != ''">
+                and parentId = #{parentId}
+            </if>
             <if test="name != null and '' != name">
                 AND `name` LIKE CONCAT('%',#{name},'%')
             </if>
@@ -22,10 +28,10 @@
 
 
     <insert id="insertDept" keyProperty="id" parameterType="com.glxp.api.entity.auth.DeptEntity">
-        INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code)
+        INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code, parentId)
         values (#{name},
                 #{flag},
-                #{remark}, #{updateTime}, #{code})
+                #{remark}, #{updateTime}, #{code}, #{parentId})
     </insert>
 
     <update id="updateDept" parameterType="com.glxp.api.entity.auth.DeptEntity">
@@ -36,6 +42,7 @@
             <if test="remark != null">remark=#{remark},</if>
             <if test="code != null">code=#{code},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="parentId != null">parentId=#{parentId},</if>
         </trim>
         WHERE id=#{id}
     </update>