feats

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -417,13 +417,14 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
     })
     public ResponseBean selectByAddress(@RequestParam("orgId") Integer orgId,
+                                        @RequestParam(value = "communityId") Integer communityId,
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,
                                         @RequestParam(value = "buildingId",required = false) Integer buildingId,
                                         @RequestParam(value = "unitId", required = false) Integer unitId,
                                         @RequestParam(value = "levelId", required = false) Integer levelId) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.selectBuildList(orgId, phaseId, buildingId, unitId, levelId);
+        responseBean = iBuildingOwnerInfoService.selectBuildList(orgId, communityId, phaseId, buildingId, unitId, levelId);
         return responseBean;
 
     }

src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java

@@ -23,8 +23,8 @@ public interface TpPhaseMapper extends BaseMapper<TpPhase> {
      * @return
      */
     @ResultType(TpPhase.class)
-    @Select("select * from tp_phase where org_id = #{orgId}")
-    List<TpPhase> selectByAddress(@Param("orgId") Integer orgId);
+    @Select("select * from tp_phase where org_id = #{orgId} and community_id= #{communityId}")
+    List<TpPhase> selectByAddress(@Param("orgId") Integer orgId, @Param("communityId")  Integer communityId);
 
     @Update("update tp_phase set `name` = #{name} where id = #{id}")
     int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
+import io.swagger.models.auth.In;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -172,7 +173,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param levelId
      * @return
      */
-    ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
+    ResponseBean selectBuildList(Integer orgId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1212,12 +1212,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
     @Override
-    public ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
+    public ResponseBean selectBuildList(Integer orgId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
         if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
-            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(orgId);
+            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(orgId, communityId);
             responseBean.addSuccess(phaseList);
         } else if (null == buildingId && null == unitId && null == levelId) {
             List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(orgId, phaseId);