合并

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

@@ -430,17 +430,20 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         int vs = Integer.parseInt(verifyStatus);
         if (1==vs) {
             //停用当前业主认证状态，业主和家属将租客将无法使用
-            user.setVerifyStatus("2");
+//            user.setVerifyStatus("2");
         }else {
         //启动当前业主，判断业主下是否有关联业主或则家属，如果也关联家属返回有关联的用户，如果没有将可以修改认证状态
         List<TaUser> userParent=taUserMapper.selectUser(userId);
         for(TaUser users:userParent){
             if(null !=users.getParentId()&&userId.equals(users.getParentId())){
-                response.addError("有关联的用户");
+                Map<String, Object> map = Maps.newHashMap();
+                map.put("code","0");
+                map.put("data","有关联的用户");
+                response.addSuccess(map);
                 return response;
             }
         }
-            user.setVerifyStatus("1");
+//            user.setVerifyStatus("1");
         }
         taUserMapper.updateByPrimaryKeySelective(user);
         return response;

VUECODE/smart-property-manage/src/utils/request.js

@@ -40,7 +40,7 @@ service.interceptors.response.use(
       })
 
       // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
-      if (res.code === 802 || res.code === 50012 || res.code === 803) {
+      if (res.code === '802' || res.code === '50012' || res.code === '803') {
         MessageBox.confirm(
           '你已被登出，可以取消继续留在该页面，或者重新登录',
           '确定登出',

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -3,10 +3,10 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item class="filter-item" label="手机号">
-        <el-input v-model="listQuery.ownerTel" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+        <el-input v-model.trim="listQuery.ownerTel" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
       </el-form-item>
       <el-form-item class="filter-item" label="姓名" >
-        <el-input v-model="listQuery.ownerName" placeholder="姓名" />
+        <el-input v-model.trim="listQuery.ownerName" placeholder="姓名" />
       </el-form-item>
       <el-form-item label="审核状态">
         <el-select v-model="listQuery.verifyStatus" placeholder="请选择">
@@ -148,6 +148,7 @@ export default {
       this.listQuery.pageSize = 10
       this.listQuery.ownerName = ''
       this.listQuery.ownerTel = ''
+	  this.listQuery.verifyStatus= ''
       this.dataQuery()
     },
     open3(ownerTel, verifyStatus) {