提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -232,7 +232,7 @@ public class UserController extends BaseController {
             removeUserElement(session);
             return response;
         }
-        if (null != data && data instanceof TaUserVO) {
+        if (null == userId && null != data && data instanceof TaUserVO) {
             setUserElement((TaUserVO) data, session);
         }
         TaUserVO userVO = (TaUserVO) data;

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

@@ -855,6 +855,11 @@ public class TaUserServiceImpl implements ITaUserService {
             // 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
             userSetUp(user, userVO);
             userVO.setUserVerifyList(((TaUserVO)response.getData()).getUserVerifyList());
+            TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+            // 审核不通过的原因, 在查看业主查看房屋成员的时候！如果有这个值，就取出来
+            if (null != userVerify) {
+                userVO.setRemark(userVerify.getRemark());
+            }
             response.setUrl(null);
             response.addSuccess(userVO);
         }

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

@@ -95,8 +95,11 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         if ("2".equals(taUserVerify.getVerifyStatus())) {
 
             // 开始查询 业主
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-            taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());
+            TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != userVerify) {
+                TaUser taUser = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+                taUserVerify.setOwnerName(taUser.getUserName());
+            }
         }
 
         responseBean.addSuccess(taUserVerify);

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

@@ -99,4 +99,8 @@ public class TaUserVO {
      */
     private List<TaUserVerify> userVerifyList;
 
+    /**
+     * 备注 /  审核不通过原因
+     */
+    private String remark;
 }