修复 修改楼栋资料的时候 分 已认证和为认证情况,

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -44,9 +44,10 @@ public class BuildingOwnerInfoController extends BaseController {
                     "pageNum第几页;pageSize 一页多少行;")
     })
     @RequestMapping(value = "/building/list", method = RequestMethod.POST)
-    public ResponseBean getList(@RequestBody String parameter){
+    public ResponseBean getList(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.listQuery(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/User.java

@@ -30,7 +30,6 @@ public class User implements Serializable {
     /**
      * 小区id, 这字段作废不使用
      */
-    @Deprecated
     private Integer communityId;
 
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -26,9 +26,10 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
     /**
      * 根据条件查询
      * @param parameter
+     * @param userElement 用户登陆后的信息
      * @return
      */
-    ResponseBean listQuery(String parameter);
+    ResponseBean listQuery(String parameter, UserElement userElement);
 
     /**
      * 修改 楼栋业主信息

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -80,7 +80,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
-    public ResponseBean listQuery(String parameter) {
+    public ResponseBean listQuery(String parameter, UserElement userElement) {
 
         ResponseBean responseBean = new ResponseBean();
 
@@ -93,6 +93,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
 
         Map<String, Object> map = Maps.newHashMap();
+        // 小区Id
+        map.put("community_id", userElement.getCommunityId());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -144,6 +146,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 物业端的用户,也就是正在操作的物业人员
+        // 物业端用户小区Id不使用! 小区 Id 获取请使用 userElement
         User user = userMapper.selectById(userElement.getId());
 
         /**
@@ -184,8 +187,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return responseBean;
         }
 
-        // 开始修改手机号操作!
-
+        // 开始更新楼栋资料
         BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
 
         oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
@@ -197,15 +199,29 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             throw new WisdomException("操作失败!");
         }
 
-        // 修改 APP 端业主用户的手机号信息!
+        /**
+         * APP 端这里, 如果楼栋资料库是已认证和已关联的! 那么就不允许修改手机号
+         */
+
         // 开始匹配 APP 端用户表
         // 查询 APP 端业主
-        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
-        if (null != appOwnerUser) {
-            // 修改手机号
-            appOwnerUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), oldTpBuildingOwnerInfo.getCommunityId());
+        if (null != appOwnerUser
+                && !"1".equals(oldTpBuildingOwnerInfo.getVerifyStatus())
+                && !"1".equals(oldTpBuildingOwnerInfo.getPairStatus())) {
+            // 修改APP端信息
+            appOwnerUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+            appOwnerUser.setVerifyStatus("1");
+            appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
             row = taUserMapper.updateById(appOwnerUser);
 
+            // 更新 楼栋业主信息表 的认证,关联状态
+            // 认证状态  0 是未认证    1是认证通过   2是已作废
+            oldTpBuildingOwnerInfo.setVerifyStatus("1");
+            // 关联状态   0 未关联  1 是已关联
+            oldTpBuildingOwnerInfo.setPairStatus("1");
+            row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
+
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
         }