LiGuang 3 년 전
부모
커밋
4058f7b4f4
1개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8 5
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/mapper/xml/UserPrizeMapper.xml

+ 8 - 5
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/mapper/xml/UserPrizeMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.geke.userPrize.mapper.UserPrizeMapper">
 
-    <select id="lists" resultType="java.util.Map">
-        select DISTINCT b.id as'userid',b.realname as 'realname',a.id,a.demo,a.date,a.type from geke_user_prize a
+    <select id="lists" resultType="org.jeecg.modules.geke.userPrize.entity.UserPrize">
+        select DISTINCT b.id as'userid',b.realname as 'realname',a.id,a.demo,a.date,a.type,a.create_by as 'createBy' from geke_user_prize a
         left join sys_user b on a.user_id=b.id
         left join sys_user_depart c on b.id=c.user_id
         left join sys_depart d on c.dep_id=d.id
@@ -11,8 +11,11 @@
         <if test="userPrize.realname!=null and ''!=userPrize.realname">
             and b.realname like concat(concat('%',#{userPrize.realname}),'%')
         </if>
-        <if test="userPrize.deptId!=null and ''!=userPrize.deptId">
-            and d.depart_name like concat(concat('%',#{userPrize.deptId}),'%')
+        <if test="deptids!=null and deptids.size()>0">
+            and d.id in
+            <foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
         <if test="userPrize.demo!=null and ''!=userPrize.demo">
             and a.demo like concat(concat('%',#{userPrize.demo}),'%')
@@ -28,7 +31,7 @@
         </if>
     </select>
     <select id="queryDept" resultType="java.util.Map">
-        select d.id,d.depart_name as 'name' from sys_user_depart c
+        select d.id,d.depart_name as 'name',d.org_code as 'code' from sys_user_depart c
         left join sys_depart d on c.dep_id=d.id
         left join sys_user a on a.id=c.user_id
         where a.del_flag='0'