傅行帆 5 лет назад
Родитель
Сommit
84df230696

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Просмотреть файл

230
      */
230
      */
231
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
231
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
232
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
232
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
233
-                                             String startPrice, String endPrice, String apartmentId, String source,
233
+                                             String startPrice, String endPrice, String apartmentId,@RequestParam(value = "source", required = false) String source,
234
                                              HttpServletRequest request) {
234
                                              HttpServletRequest request) {
235
         ResponseBean responseBean = new ResponseBean();
235
         ResponseBean responseBean = new ResponseBean();
236
         Integer orgId = getOrgId(request);
236
         Integer orgId = getOrgId(request);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java Просмотреть файл

208
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
208
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
209
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
209
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
210
                                                @RequestParam("personId") String personId,
210
                                                @RequestParam("personId") String personId,
211
-                                               @RequestParam("source") String source,
211
+                                               @RequestParam(value = "source", required = false) String source,
212
                                                HttpServletRequest request) {
212
                                                HttpServletRequest request) {
213
         ResponseBean responseBean = new ResponseBean();
213
         ResponseBean responseBean = new ResponseBean();
214
         Integer orgId = getOrgId(request);
214
         Integer orgId = getOrgId(request);

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Просмотреть файл

793
         if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
793
         if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
794
             throw new Exception("房源已被取消发布");
794
             throw new Exception("房源已被取消发布");
795
         }
795
         }
796
-        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
796
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
797
             throw new Exception("房源已被其他客户锁定");
797
             throw new Exception("房源已被其他客户锁定");
798
         }
798
         }
799
         //销售批次信息
799
         //销售批次信息