zhangshi_app_backend.git

			@@ -57,6 +57,12 @@
			@Resource
			RestHighLevelClient restHighLevelClient;

			@Resource
			ZfContactShraServiceImpl zfContactShraService;

			@Resource
			ZfContactDownlService zfContactDownlService;


			private LambdaQueryWrapper<ZfContact> buildCondition(ZfContact zfContact,List<Long> familyIdList) {
			LambdaQueryWrapper<ZfContact> lqw = new LambdaQueryWrapper<>();
			@@ -215,7 +221,7 @@
			fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
			Long motherFaId = 0L;
			if(myself.getMomId()!=null)
			motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
			motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

			//也要查别人授权的
			List<ZAuthority> authority = zAuthorityService.getAuthority();
			@@ -264,7 +270,7 @@
			public List<ZfContact> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfContact> beanRecords){
			return beanRecords.stream().peek(
			bean -> {
			if (bean.getFamilyId() == familyId\|\|(fatherFamilyId!=0L && fatherFamilyId==familyId)\|\|(motherFamilyId!=0L && motherFamilyId==familyId)) {
			if (Objects.equals(bean.getFamilyId(), familyId) \|\|(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))\|\|(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
			bean.setOwnData(1);
			} else {
			bean.setOwnData(0);
			@@ -304,7 +310,7 @@
			fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
			Long motherFaId = 0L;
			if(myself.getMomId()!=null)
			motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
			motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

			//也要查别人授权的
			List<ZAuthority> authority = zAuthorityService.getAuthority();
			@@ -594,6 +600,9 @@

			List<ZfContact> zfContacts = listByIds(Arrays.asList(ids));

			if (! (zfContactDownlService.deleteData(ids) && zfContactShraService.deleteByContentId(ids) ) ){
			return AjaxResult.error();
			}
			if (zfContactService.removeByIds(Arrays.asList(ids))) {

			//删除es中的数据