productDev/dmvisit.git

			@@ -299,8 +299,7 @@
			}

			@Override
			public void deleteById(Integer id) {
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			public void deleteById(Integer id,LoginUserInfo user) {
			Bookings bookings = new Bookings();
			bookings.setId(id);
			bookings.setIsdeleted(MeetConstants.ONE);
			@@ -310,14 +309,13 @@
			}

			@Override
			public void delete(Bookings bookings) {
			public void delete(Bookings bookings,LoginUserInfo user) {
			UpdateWrapper<Bookings> deleteWrapper = new UpdateWrapper<>(bookings);
			bookingsMapper.delete(deleteWrapper);
			}

			@Override
			public void deleteByIdInBatch(List<Integer> ids) {
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			@@ -349,8 +347,7 @@
			if(dbBookings.getStatus().equals(MeetConstants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "本次操作失败,预约状态已流转");
			}
			LoginUserInfo user = new LoginUserInfo();
			user.setId(bookings.getCreator());
			LoginUserInfo user = bookings.getLoginUserInfo();
			isCreateParamValid(bookings, user);
			bookings.setEditDate(new Date());
			bookings.setEditor(user.getId());
			@@ -385,6 +382,9 @@
			@Override
			public void cancelById(Bookings bs) {
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(user == null){
			user = bs.getLoginUserInfo();
			}
			/*
			if(Objects.isNull(bookings)\|\|bookings.getId()==null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
			@@ -513,7 +513,7 @@
			prquery.selectAll(ProjectRel.class);
			prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
			prquery.eq(ProjectRel::getObjId, s.getId());
			prquery.select("(select p.name from projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0 ) as projectName");
			prquery.select("(select p.name from meeting_projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0 ) as projectName");
			List<ProjectRel> prList = projectRelJoinMapper.selectJoinList(ProjectRel.class, prquery);
			s.setProjectList(prList);

			@@ -744,7 +744,7 @@
			@Override
			public List<Bookings> getMyBookings(Integer userId, String dateMsg) {
			return bookingsMapper.selectList(new QueryWrapper<Bookings>()
			.apply(" id in ( select u.OBJ_ID from user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
			.apply(" id in ( select u.OBJ_ID from meeting_user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
			.eq("ISDELETED",MeetConstants.ZERO)
			// .eq("STATUS",MeetConstants.ZERO)
			.apply(" ROOM_ID in ( select r.id from rooms r where r.ISDELETED = 0 and r.STATUS = 0 )")
			@@ -765,7 +765,7 @@
			j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or()
			.like(" b.NAME", pageWrap.getModel().getRoomsName()))
			.exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
			" select 1 from user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
			" select 1 from meeting_user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
			.eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
			.like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
			.eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())