bug fix

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -362,6 +362,9 @@
             AND e.target_type = 'share'
             AND e.target_id = 'index'
         </if>
+        <if test="targetName != null and targetName !=''">
+            AND e.target_name like concat('%', #{targetName} ,'%')
+        </if>
 
             AND e.create_date BETWEEN #{startDate} and #{endDate}
             <!-- building_id 字段数据不全
@@ -374,7 +377,7 @@
             AND t.person_id = #{personId}
         </if>
         <if test="userName != null and userName !=''">
-            AND t.nickname like concat('%', #{userName} ,'%')
+            AND IFNULL(t.name, t.nickname) like concat('%', #{userName} ,'%')
         </if>
             <!--            AND t.`status` = 1-->
         ORDER BY e.create_date DESC