Browse Source

训练营新增搜索创客姓名条件

mac 2 years ago
parent
commit
e0487ca92f

+ 5 - 2
kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampBonusLogMapper.xml

@@ -34,8 +34,11 @@
             <if test="param.campId != null">
                 AND cbl.camp_id = #{param.campId}
             </if>
-            <if test="param.userCode != null">
-                AND cu.user_code = #{param.userCode}
+            <if test="param.userCode != null and param.userCode != ''">
+                and cr.user_code = #{param.userCode}
+            </if>
+            <if test="param.username != null and param.username != ''">
+                and cr.username = #{param.username}
             </if>
             <if test="param.sourceType != null">
                 AND cbl.source_type = #{param.sourceType}

+ 4 - 1
kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampReportMapper.xml

@@ -31,9 +31,12 @@
             <if test="param.status != null">
                 and cr.status = #{param.status}
             </if>
-            <if test="param.userCode != null">
+            <if test="param.userCode != null and param.userCode != ''">
                 and cr.user_code = #{param.userCode}
             </if>
+            <if test="param.username != null and param.username != ''">
+                and cr.username = #{param.username}
+            </if>
         </where>
         order by 
         cr.create_time desc