Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -7,7 +7,6 @@ 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;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -39,10 +38,6 @@ public class TaQrcodeController extends BaseController {
     @Autowired
     public ITaQrcodeService iTaQrcodeService;
 
-    @Autowired
-    private IMiniAppService iMiniAppService;
-
-
     /**
      * 分页查询列表
      *
@@ -60,7 +55,7 @@ public class TaQrcodeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request), personBuildingList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());

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

@@ -34,7 +34,6 @@ public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
                                           @Param("targetName") String targetName,
                                           @Param("channelId") Integer channelId,
                                           @Param("buildingId") String buildingId,
-                                          @Param("userId") Integer userId,
                                           @Param("orgId") Integer orgId,
                                           @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 public interface ITaQrcodeService extends IService<TaQrcode> {
 
     ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
-                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+                                       String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
 

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

@@ -69,10 +69,10 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
      */
     @Override
     public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
-                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+                                              String buildingId, 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, userId, orgId, personBuildingList));
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId, personBuildingList));
         return responseBean;
     }
 

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -26,9 +26,6 @@
         <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=",">