gqx пре 2 година
родитељ
комит
397c91509a

+ 10 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomController.java

@@ -10,7 +10,10 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.service.IBusMeetingRoomService;
@@ -84,6 +87,13 @@ public class BusMeetingRoomController extends JeecgController<BusMeetingRoom, IB
 	//@RequiresPermissions("business:bus_meeting_room:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMeetingRoom busMeetingRoom) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMeetingRoom.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMeetingRoom.setStatus(1);
 		busMeetingRoomService.save(busMeetingRoom);
 		return Result.OK("添加成功!");
 	}

+ 2 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.TokenUtils;
@@ -50,7 +51,7 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
          */
         BusMeetingRoomSchedule roomSchedule = new BusMeetingRoomSchedule();
 
-        BeanUtil.copyProperties(dto,roomSchedule);
+        BeanUtil.copyProperties(dto,roomSchedule, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
         roomSchedule.setTenantId(tenantId);
         roomSchedule.setCreateTime(LocalDateTime.now());
         meetingRoomScheduleMapper.insert(roomSchedule);