人员完善

src/main/resources/mapper/UserMapper.xml

@@ -4,28 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dc.dc_project.mapper.UserMapper">
 
-    <resultMap id="BaseResultMap" type="com.dc.dc_project.model.pojo.User">
-            <id property="id" column="id" />
-            <result property="username" column="username" />
-            <result property="password" column="password" />
-            <result property="real_name" column="real_name" />
-            <result property="gender" column="gender" />
-            <result property="phone" column="phone" />
-            <result property="email" column="email" />
-            <result property="org_id" column="org_id" />
-            <result property="status" column="status" />
-            <result property="last_login_time" column="last_login_time" />
-            <result property="remark" column="remark" />
-            <result property="created_at" column="created_at" />
-            <result property="updated_at" column="updated_at" />
-            <result property="is_deleted" column="is_deleted" />
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,username,password,real_name,gender,phone,
-        email,org_id,status,last_login_time,remark,
-        created_at,updated_at,is_deleted
-    </sql>
     <select id="getUserListBySelf" resultType="com.dc.dc_project.model.vo.UserVo">
         SELECT
         u.id,
@@ -63,4 +41,42 @@
             and u.is_deleted = 0
         </where>
     </select>
+    <select id="getUserListByAll" resultType="com.dc.dc_project.model.vo.UserVo">
+        SELECT
+        u.id,
+        u.username,
+        p.name as real_name,
+        p.sex,
+        u.phone,
+        p.email,
+        o.id as org_id,
+        u.status,
+        u.last_login_time,
+        u.remark,
+        p.id AS personnel_id,
+        o.name AS org_name
+        FROM sys_user u
+        LEFT JOIN sys_personnel p ON u.id = p.user_id
+        LEFT JOIN sys_personnel_org spo ON p.id = spo.personnel_id
+        LEFT JOIN sys_org o ON spo.org_id = o.id
+        <where>
+            <if test="userReqDto.name != null">
+                AND (p.name LIKE CONCAT('%',#{userReqDto.name},'%') OR u.username LIKE CONCAT('%',#{userReqDto.name},'%'))
+            </if>
+            <if test="userReqDto.phone != null">
+                AND u.phone LIKE CONCAT('%',#{userReqDto.phone},'%')
+            </if>
+            <if test="userReqDto.email != null">
+                AND p.email LIKE CONCAT('%',#{userReqDto.email},'%')
+            </if>
+            <if test="userReqDto.status != null">
+                AND u.status = #{userReqDto.status}
+            </if>
+            <if test="orgIds != null">
+                AND o.id in (#{orgIds})
+            </if>
+            and u.is_deleted = 0
+        </where>
+        limit #{userReqDto.current},#{userReqDto.size}
+    </select>
 </mapper>