* bug fix

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
@@ -58,7 +59,8 @@ public class TaQrcodeController extends BaseController {
                 targetType, targetName, channelId, buildingId);
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request));
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
@@ -33,7 +34,9 @@ public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
                                           @Param("targetName") String targetName,
                                           @Param("channelId") Integer channelId,
                                           @Param("buildingId") String buildingId,
-                                          @Param("orgId") Integer orgId);
+                                          @Param("userId") Integer userId,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 获取访问用户人数

src/main/java/com/huiju/estateagents/service/ITaQrcodeService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -21,7 +23,8 @@ import java.io.IOException;
  */
 public interface ITaQrcodeService extends IService<TaQrcode> {
 
-    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId);
+    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
 

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -10,6 +10,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxQrCodeUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
@@ -66,10 +67,11 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
      * @return
      */
     @Override
-    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId) {
+    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId));
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, userId, orgId, personBuildingList));
         return responseBean;
     }
 

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -21,11 +21,21 @@
             AND t.target_type = #{targetType}
         </if>
         <if test = "targetName != '' and targetName != null">
-            AND t.target_name = #{targetName}
+            AND t.target_name like concat ('%',#{targetName},'%')
         </if>
         <if test = "channelId != null">
             AND t.channel_id = #{channelId}
         </if>
+        <if test = "userId != null">
+            AND t.create_user = #{userId}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+                OR t.building_id is null)
+        </if>
       ORDER BY
         t.create_date DESC
     </select>