productDev/dmvisit.git

			@@ -43,6 +43,9 @@
			<el-option label="同步失败" value="2"></el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="" prop="idcardNo">
			<el-input v-model="searchForm.idcardNo" placeholder="身份证号" @keypress.enter.native="search"></el-input>
			</el-form-item>
			<section>
			<el-button type="primary" @click="search">搜索</el-button>
			<el-button @click="reset">重置</el-button>
			@@ -240,7 +243,8 @@
			positionId: '',
			companyId: '',
			hasFace: '',
			authStatus: ''
			authStatus: '',
			idcardNo: ''
			},
			loading: false,
			heading: false,

			@@ -42,6 +42,9 @@
			<el-option label="同步成功" value="1"></el-option>
			<el-option label="同步失败" value="2"></el-option>
			</el-select>
			<el-form-item label="" prop="idcardNo">
			<el-input v-model="searchForm.idcardNo" placeholder="身份证号" @keypress.enter.native="search"></el-input>
			</el-form-item>
			</el-form-item>
			<!-- <el-form-item label="">
			<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">是否包含下级组织</el-checkbox>
			@@ -254,7 +257,8 @@
			workStatus: '',
			positionId: '',
			companyId: '',
			hasFace: ''
			hasFace: '',
			idcardNo:''
			},
			loading: false,
			heading: false,

			@@ -1491,6 +1491,9 @@
			.like(Member::getPhone,pageWrap.getModel().getKeyword())
			.or().like(Member::getName,pageWrap.getModel().getKeyword())
			.or().like(Member::getCode,pageWrap.getModel().getKeyword()))
			.eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,
			DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())
			)
			.isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
			.isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
			.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
			@@ -2194,7 +2197,7 @@
			String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
			if(StringUtils.isNotBlank(model.getIdcardNo())){
			if(findMemberFromListByIdcard(candNo,memberList ) !=null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请确认【访客管理】【内部人员】以及【相关方人员】中无该身份证存在，请检查表格内容！");
			}
			}

	admin/src/views/business/internalMember.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/relativeMember.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史