提交

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

@@ -807,13 +807,14 @@ public class TaUserServiceImpl implements ITaUserService {
         // 获取用户
         TaUser user = taUserMapper.selectByPrimaryKey(userElement.getId());
         if (null == user) {
-            response.addError("业主用户不存在！");
+            response.addError("用户不存在！");
             return response;
         }
         if (null != userId) {
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
+            TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
             // 判断 家属或者租客 属不属于这个业主的下面
-            if (todUser != null && !user.getId().equals(todUser.getParentId())) {
+            if (null == todUserVerify) {
                 response.addError("您的下面没有该家属或者租客!");
                 return response;
             }
@@ -970,8 +971,14 @@ public class TaUserServiceImpl implements ITaUserService {
         if ("1".equals(verifyStatus)) {
             // 设置 userVO 信息
             setUserVoProperties(userVerify.getCommunityId(), taUserVO);
-
+            taUserVO.setPhaseId(userVerify.getPhaseId());
+            taUserVO.setBuildingId(userVerify.getBuildingId());
+            taUserVO.setUnitId(userVerify.getUnitId());
+            taUserVO.setLevelId(userVerify.getLevelId());
+            taUserVO.setRoomNoId(userVerify.getRoomNoId());
             taUserVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
+
+
             TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             taUserVO.setRole(taSysRole.getRoleName());
 

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

@@ -77,7 +77,6 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         taUserVerify.setRoleName(taSysRole.getRoleName());
         if ("2".equals(taUserVerify.getVerifyStatus())) {
 
-            // TODO 楼栋资料库查询有变动
             // 开始查询 业主
             TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
             taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());

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

@@ -73,4 +73,18 @@ public class TaUserVO {
     /** 审核的id **/
     private Integer userVerifyId;
 
+    /**  期id **/
+    private Integer phaseId;
+
+    /**  栋id **/
+    private Integer buildingId;
+
+    /**  单元id **/
+    private Integer unitId;
+
+    /**  楼层id **/
+    private Integer levelId;
+
+    /**  户号id **/
+    private Integer roomNoId;
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -41,4 +41,19 @@ public class UserElement implements Serializable {
     /** 当前登陆的房产 **/
     private Integer userVerifyId;
 
+    /** 当前登录 期id **/
+    private Integer phaseId;
+
+    /** 当前登录 栋id **/
+    private Integer buildingId;
+
+    /** 当前登录 单元id **/
+    private Integer unitId;
+
+    /** 当前登录 楼层id **/
+    private Integer levelId;
+
+    /** 当前登录 户号id **/
+    private Integer roomNoId;
+
 }