* 代码优化

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

@@ -457,7 +457,7 @@ public class TaHousingResourcesController extends BaseController {
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, raiseHouseId, getOrgId(request), getPersonId(request));
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request),raiseHouseId, getPersonId(request));
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -187,7 +187,7 @@ public class TaPerson implements Serializable {
     /**
      * 身份证号
      */
-    private String idCard;
+    private String idcard;
 
     /**
      * 访问记录

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

@@ -582,7 +582,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         }
 
         pg.getRecords().stream().forEach(record -> {
-            if (StringUtils.isEmpty(record.getLockingPersonId()) && "unlocked".equals(record.getHouseLockingStatus())) {
+            if (StringUtils.isEmpty(record.getLockingPersonId()) && !"locked".equals(record.getHouseLockingStatus())) {
                 record.setShowLocking(true);
             } else {
                 record.setShowLocking(false);
@@ -624,7 +624,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         if ("lock".equals(type)) {
 
             // 校验当前用户是否有修改权限
-            if (StringUtils.isEmpty(po.getLockingPersonId()) && "unlocked".equals(po.getHouseLockingStatus())) {
+            if (StringUtils.isEmpty(po.getLockingPersonId()) && !"locked".equals(po.getHouseLockingStatus())) {
                 // 更行房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());