修复 bug， 物业端号码校验更改，修改 bug 4477

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

@@ -335,13 +335,13 @@ public class TaUserServiceImpl implements ITaUserService {
         // 查询出这个手机号
         TaUser hasUserPhone = hasUserPhone(phone);
         if (null != hasUserPhone && user.getId().intValue() != hasUserPhone.getId().intValue()) {
-            response.addError("号码已占用");
+            response.addError("手机号已被使用，请更换其他手机号");
             return response;
         }
 
-        // 如果提交上来的手机号 和 这个用户本身的手机号相等，就直接返回成功！
+        // 如果提交上来的手机号 和 这个用户本身的手机号相等，就直接返回，不做其他操作
         if (null != hasUserPhone && user.getLoginName().equals(phone)) {
-            response.addSuccess(new String[0]);
+            response.addError("手机号已被使用，请更换其他手机号");
             return response;
         }
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
@@ -350,7 +350,7 @@ public class TaUserServiceImpl implements ITaUserService {
         int errorCode = jsonobject.getInteger("errorCode");
         if (errorCode != 0) {
             log.error("海康电话已存在,推送海康电话修改失败");
-            response.addError("此手机号已注册");
+            response.addError("手机号已被使用，请更换其他手机号");
             return response;
         }
 
@@ -361,7 +361,7 @@ public class TaUserServiceImpl implements ITaUserService {
         taUser.setUpdateDate(new Date());
         taUser.setUpdateUser(user.getId());
         taUserMapper.updateLongName(taUser);
-        response.addSuccess("修改成功");
+        response.addSuccess("修改手机号成功，以后请使用新手机号登录");
 
         // 修改楼栋资料库手机号
         tpBuildingOwnerInfoMapper.updateAllByPhone(user.getLoginName(), phone);

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

@@ -80,22 +80,12 @@ public class AnnouncementTelController extends BaseController {
 	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
 	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
-		boolean isPhone = true;
-		boolean isLandline = true;
-//		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
-//			isLandline = false;
-//		}
-//		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
-//			isPhone = false;
-//		}
-//		if (isPhone == false && isLandline == false) {
-//			responseBean.addError("输入的号码不正确!");
-//			return responseBean;
-//		}
+
 		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
 			responseBean.addError("输入的号码不正确!");
 			return responseBean;
 		}
+
 		UserElement userElement = getUserElement(session);
 		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
 		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -80,6 +80,18 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     TaUserVerify selectCommunityAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
 
+    /**
+     * 查询用户审核数据！   小区id，用户id，期id，栋id，单元id，楼层id，房间id，审核状态
+     * @param userId
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param verifyStatus
+     * @return
+     */
     List<TaUserVerify> selectUserVerifyCommunityAndAddress(@Param("userId") Integer userId,
                                                  @Param("communityId") Integer communityId,
                                                  @Param("phaseId") Integer phaseId,

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

@@ -22,6 +22,7 @@ import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Maps;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
@@ -544,12 +545,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             taUserVerify.setRoleId(2);
         }
 
-        // TODO 是否只允许一个房产中只有一个角色？还是说多个角色？排除业主角色
-        TaUserVerify boolUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userId, userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
+        // 只允许一个房产中只有一个角色
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectUserVerifyCommunityAndAddress(userId, userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
                 tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
-                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), taUserVerify.getRoleId());
+                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), 1);
         // 表示这个用户在这个房产中已经有了这个角色, 就不进行插入
-        if (null != boolUserVerify) {
+        if (CollectionUtils.isNotEmpty(userVerifyList) && userVerifyList.size() > 0) {
             return;
         }
 

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <div style="display: flex;">
-          <el-button style="margin-left: 10px;" size="large" type="primary" @click="exportExcel">下载模板-小区</el-button>
+          <el-button style="margin-left: 10px;" size="large" type="primary" @click="exportExcel">下载模板</el-button>
           <el-upload :on-change="handleChange" :before-upload="beforeUpload" :limit="1" class="upload-demo" action="" multiple>
             <!-- <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"></a> -->
             <el-button slot="trigger" size="large" type="primary" style="margin-left: 10px;">选取文件并预览</el-button>
@@ -155,7 +155,7 @@ export default {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
-        link.setAttribute('download', '户主资料库.xlsx')
+        link.setAttribute('download', '业主资料库.xlsx')
         document.body.appendChild(link)
         link.click()
       }).catch(() => {

VUECODE/smart-property-manage/src/views/systemResources/property/add/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="root">
-    <el-form :model="formInline" :rules="rules" label-width="80px" class="form-class">
+    <el-form ref="ruleForm" :model="formInline" :rules="rules" label-width="80px" class="form-class">
       <el-form-item label="名称" prop="name">
         <el-input v-model="formInline.name"/>
       </el-form-item>
@@ -12,7 +12,7 @@
       </el-form-item>
       <div class="button-class">
         <el-button type="info" @click="exit">取消</el-button>
-        <el-button type="primary" @click="add">保存</el-button>
+        <el-button type="primary" @click="add('ruleForm')">保存</el-button>
       </div>
     </el-form>
   </div>
@@ -33,24 +33,31 @@ export default {
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         tel: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
-          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
+          { required: true, message: '请输入号码', trigger: 'blur' },
+          { min: 6, max: 11, required: true, message: '请输入6～11位号码', trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
-    add() {
-      this.$store.dispatch('TelAdd', this.formInline).then(res => {
-        const resCode = res.code
-        if (resCode === '1') {
-          this.$message.error(res.message)
-          return
+    add(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('TelAdd', this.formInline).then(res => {
+            const resCode = res.code
+            if (resCode === '1') {
+              this.$message.error(res.message)
+              return
+            }
+            this.$message.success(res.message)
+            this.$router.go(-1)
+          }).catch(() => {
+            console.log('error TelAdd')
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-        this.$message.success(res.message)
-        this.$router.go(-1)
-      }).catch(() => {
-        console.log('error TelAdd')
       })
     },
     exit() {

VUECODE/smart-property-manage/src/views/systemResources/property/edi/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="root">
-    <el-form :model="formInline" :rules="rules" label-width="80px" class="form-class">
+    <el-form ref="ruleForm" :model="formInline" :rules="rules" label-width="80px" class="form-class">
       <el-form-item label="名称" prop="name">
         <el-input v-model="formInline.name"/>
       </el-form-item>
@@ -12,7 +12,7 @@
       </el-form-item>
       <div class="button-class">
         <el-button type="info" @click="exit">取消</el-button>
-        <el-button type="primary" @click="updateTels">保存</el-button>
+        <el-button type="primary" @click="updateTels('ruleForm')">保存</el-button>
       </div>
     </el-form>
   </div>
@@ -34,8 +34,8 @@ export default {
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         tel: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
-          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
+          { required: true, message: '请输入号码', trigger: 'blur' },
+          { min: 6, max: 11, required: true, message: '请输入6～11位号码', trigger: 'blur' }
         ]
       }
     }
@@ -45,17 +45,24 @@ export default {
     this.getTelsById()
   },
   methods: {
-    updateTels() {
-      this.$store.dispatch('TelUpdate', this.formInline).then(res => {
-        const resCode = res.code
-        if (resCode === '1') {
-          this.$message.error(res.message)
-          return
+    updateTels(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('TelUpdate', this.formInline).then(res => {
+            const resCode = res.code
+            if (resCode === '1') {
+              this.$message.error(res.message)
+              return
+            }
+            this.$message.success(res.message)
+            this.$router.go(-1)
+          }).catch(() => {
+            console.log('error TelUpdate')
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-        this.$message.success(res.message)
-        this.$router.go(-1)
-      }).catch(() => {
-        console.log('error TelUpdate')
       })
     },
     exit() {