合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -144,7 +144,14 @@ public class TaUserServiceImpl implements ITaUserService {
 
             ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
             taUserVO.setCommunityName(communities.getCommunityName());
-
+            //查询当前人信息
+            if (null!=currentUser.getParentId() && !"".equals(currentUser.getParentId())) {
+                //查询当前人业主或租客的信息
+                TaUser proprietorUser = taUserMapper.selectByPrimaryKey(currentUser.getParentId());
+                taUserVO.setProprietorID(proprietorUser.getId());
+                taUserVO.setProprietorPhone(proprietorUser.getLoginName());
+                taUserVO.setProprietorName(proprietorUser.getUserName());
+            }
             response.addSuccess(taUserVO);
             return response;
         }else {
@@ -817,7 +824,13 @@ public class TaUserServiceImpl implements ITaUserService {
             userVO.setFace("unregister");
         }
 
-
+        if (null!=user.getParentId() && !"".equals(user.getParentId())) {
+            //查询当前人业主或租客的信息
+            TaUser proprietorUser = taUserMapper.selectByPrimaryKey(user.getParentId());
+            userVO.setProprietorID(proprietorUser.getId());
+            userVO.setProprietorPhone(proprietorUser.getLoginName());
+            userVO.setProprietorName(proprietorUser.getUserName());
+        }
         response.addSuccess(userVO);
 
         return response;

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -58,4 +58,13 @@ public class TaUserVO {
     /** 人脸录入 **/
     private String face;
 
+    /**业主电话**/
+    private String proprietorPhone;
+
+    /**业主名字**/
+    private String proprietorName;
+
+    /**业主ID**/
+    private Integer proprietorID;
+
 }

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

@@ -427,7 +427,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         //用手机号去查当前用户id
         Integer userId = taUserMapper.getUserID(ownerTel);
         user.setId(userId);
-        if ("1".equals(verifyStatus)) {
+        int vs = Integer.parseInt(verifyStatus);
+        if (1==vs) {
             //停用当前业主认证状态，业主和家属将租客将无法使用
             user.setVerifyStatus("2");
         }else {