productDev/dmvisit.git

			@@ -209,7 +209,9 @@
			company.setEditDate(date);
			company.setStatus(respone.getStatus());
			company.setCode(respone.getCode());
			if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
			company.setErpParentId(respone.getParentOrgId());
			}
			company.setErpDate(date);
			company.setHkStatus(Constants.ZERO);
			return company;
			@@ -282,10 +284,10 @@
			.eq(Member::getType, Constants.memberType.internal));
			dealUserChangeList(list,addList,updateList,delList,allList);
			if(addList.size()>0){
			memberMapper.insertBatchSomeColumn(addList);
			for (Member member:addList) {
			dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
			}
			memberMapper.insertBatchSomeColumn(addList);
			}
			if(updateList.size()>0){
			for(Member c : updateList){
			@@ -369,6 +371,7 @@
			member.setErpStatus(Constants.ONE);
			member.setErpDate(new Date());
			member.setErpId(param.getId());
			member.setIdcardType(param.getIdType());
			member.setFsStatus(Constants.ZERO);
			member.setStatus(param.getStatus());
			member.setType(Constants.memberType.internal);
			@@ -881,10 +884,13 @@
			*/
			private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
			//删除所有老的授权信息
			if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
			empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
			.eq(Empower::getMemberId,member.getId())
			.set(Empower::getIsdeleted,Constants.ONE)
			.set(Empower::getSendStatus,Constants.ZERO));
			}

			// empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
			// .eq(Empower::getMemberId,member.getId())
			// );
			@@ -919,7 +925,9 @@

			private List<Integer> getRoleIdByParam(Integer[] param, Member member) {
			//添加人员角色关联数据
			if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
			memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
			}
			if(!Objects.isNull(param)&&param.length>Constants.ZERO){
			//查询数据库存在的权限
			List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()