bug

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -145,7 +145,7 @@ public class TaBuildingController extends BaseController {
                                            @RequestParam(value = "cityId", required = false) Integer cityId,
                                            @RequestParam(value = "isMain", required = false) Integer isMain,
                                            HttpServletRequest request) {
-        return taBuildingService.buildingListSelect(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request));
+        return taBuildingService.buildingListSelect(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -37,7 +37,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param
      * @return
      */
-    List<TaBuilding> buildingListSelect(@Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<TaBuilding> buildingListSelect(@Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("institutionIds") List<String> institutionIds);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

src/main/java/com/yunzhi/marketing/service/ITaBuildingService.java

@@ -34,7 +34,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList, List<String> InstitutionIds);
 
     /**
      * 楼盘详情

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -178,11 +178,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, List<String> InstitutionIds) {
 //        Page<TaBuilding> page = new Page<>();
 //        page.setSize(pageSize == null ? 10 : pageSize);
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList,InstitutionIds);
 //        page.setRecords(building);
         return ResponseBean.success(building);
     }

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

@@ -274,7 +274,12 @@ public class CustomerInfoController extends BaseController {
                 customerInfoVO.setRealtyConsultantPerson(realtyPerson);
                 // 所属楼盘和 用户信息
                 LambdaQueryWrapper<TaPersonBuilding> taPersonBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant()).or().eq(TaPersonBuilding::getUserId,realtyPerson.getUserId());
+                if (null != realtyPerson) {
+                    taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant()).or().eq(TaPersonBuilding::getUserId,realtyPerson.getUserId());
+                }else {
+                    taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant());
+                }
+
                 List<TaPersonBuilding> list = taPersonBuildingService.list(taPersonBuildingLambdaQueryWrapper);
                 if (list.size() > 0) {
                     TaUser taUser = taUserService.getById(list.get(0).getUserId());

src/main/resources/mapper/TaBuildingMapper.xml

@@ -71,6 +71,12 @@
             <if test="orgId != null and orgId != ''">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND ta_building.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND ta_building.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">