productDev/dmvisit.git

			@@ -165,14 +165,11 @@
			}
			},
			changeSel (opt) {
			this.$nextTick(() => {
			console.log('=================changeSel',opt,this.form.detailList)
			var item = this.form.detailList[opt]
			this.form.detailList[opt].regionCode = null
			this.form.detailList[opt].regionName = null
			this.form.detailList[opt].carmeraList = []
			// this.form.detailList[opt].deviceId = null
			// this.form.detailList[opt].deviceName = null
			if (item.regionId) {
			var reg = this.getSelectedObject(item.regionId)
			if (reg) {
			@@ -181,6 +178,7 @@
			this.form.detailList[opt].carmeraList = reg.carmeraList
			}
			}
			this.$nextTick(() => {
			console.log('=================changeSel1' , this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId)
			if(this.notInCarmeraList( this.form.detailList[opt].carmeraList,this.form.detailList[opt].deviceId) ){
			this.form.detailList[opt].deviceId = null

			@@ -328,7 +328,7 @@
			}catch (Exception e){

			}
			if(result.size()==0){
			/*if(result.size()==0){
			//------TODO---------测试模拟数据----start-----
			for (int i = 0; i < 5; i++) {
			PageRegionInfoResponse t = new PageRegionInfoResponse();
			@@ -363,7 +363,7 @@
			result.add(t);
			}
			//------TODO---------测试模拟数据----end-----
			}
			}*/
			return ApiResponse.success(result);
			}

			@@ -156,8 +156,9 @@
			}
			if(delRetentionLis.size()>0){
			//先删除原有的在场人员(内部人员）
			//@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工 3车辆信息 4相关方人员 5货运司机 ")
			retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
			// .eq(Retention::getType,Constants.memberType.internal)
			.ne(Retention::getType,Constants.THREE)
			.in(Retention::getMemberId,delRetentionLis));
			}
			if(retentionList.size()>0){

	admin/src/components/business/OperaWarningRuleWindow.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_admin/src/main/resources/bootstrap.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史