* 代码优化

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

@@ -433,7 +433,7 @@ public class TaHousingResourcesController extends BaseController {
                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), getPersonId(request), pageNumber, pageSize);
+            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), pageNumber, pageSize);
             logger.info("listHouseByRaiseRecordId 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("listHouseByRaiseRecordId 异常：", e);
@@ -453,11 +453,11 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.GET)
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId,
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request),raiseHouseId, getPersonId(request));
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request),raiseHouseId, personId);
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -92,16 +92,4 @@ public class TaHousingResourcesPO extends TaHousingResources {
      */
     @TableField(exist = false)
     private String raiseHouseId;
-
-    /**
-     * 是否展示锁定按钮 true展示
-     */
-    @TableField(exist = false)
-    private Boolean showLocking;
-
-    /**
-     * 是否展示解锁按钮 true展示
-     */
-    @TableField(exist = false)
-    private Boolean showUnLocking;
 }

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

@@ -131,12 +131,11 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      *
      * @param raiseRecordId
      * @param orgId
-     * @param personId
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize);
+    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
 
     /**
      * 更新房源锁定状态

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

@@ -569,33 +569,13 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     }
 
     @Override
-    public ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize) {
-        logger.info("listHouseByRaiseRecordId 接收参数：raiseRecordId:{},orgId:{},personId:{},pageNumber:{},pageSize:{}",
-                raiseRecordId, orgId, personId, pageNumber, pageSize);
+    public ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize) {
+        logger.info("listHouseByRaiseRecordId 接收参数：raiseRecordId:{},orgId:{},pageNumber:{},pageSize:{}",
+                raiseRecordId, orgId, pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
         IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
-        taHousingResourcesMapper.listHouseByRaiseRecordId(pg, raiseRecordId, orgId);
-        if (CollectionUtils.isEmpty(pg.getRecords())) {
-            responseBean.addSuccess(pg);
-            return responseBean;
-        }
-
-        pg.getRecords().stream().forEach(record -> {
-            if (StringUtils.isEmpty(record.getLockingPersonId()) && !"locked".equals(record.getHouseLockingStatus())) {
-                record.setShowLocking(true);
-            } else {
-                record.setShowLocking(false);
-            }
-
-            if (personId.equals(record.getLockingPersonId()) && "locked".equals(record.getHouseLockingStatus())) {
-                record.setShowUnLocking(true);
-            } else {
-                record.setShowUnLocking(false);
-            }
-        });
-
-        responseBean.addSuccess(pg);
+        responseBean.addSuccess(taHousingResourcesMapper.listHouseByRaiseRecordId(pg, raiseRecordId, orgId));
         return responseBean;
     }