From e511aae84a62806cdac85751e2edcfd082281d67 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Mon, 22 Jul 2024 09:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerStaffController.java | 2 ++ .../impl/IcsCustomerStaffServiceImpl.java | 6 ++++++ .../impl/meeting/ReservationServiceImpl.java | 2 +- .../impl/meeting/RoomContentServiceImpl.java | 4 ++-- .../mobile/WxLoginAPIController.java | 18 +++++++++++++++--- .../meeting/ApiRoomContentController.java | 2 ++ .../mobile/meeting/ApiShowroomController.java | 4 ++-- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java index 20db53c..fd49a6e 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java @@ -192,6 +192,8 @@ public class CustomerStaffController extends BaseController { StaffCustomer staffCustomer = new StaffCustomer(); staffCustomer.setIcsCustomerId(icsCustomerStaff.getIcsCustomerId()); staffCustomer.setStaffId(customerStaff.getId()); + staffCustomer.setParkId(customer1.getParkId()); + staffCustomer.setTenantId(customer1.getTenantId()); List staffCustomers = staffCustomerService.selectStaffCustomerList(staffCustomer); if (staffCustomers.isEmpty()) { staffCustomerService.insertStaffCustomer(staffCustomer); diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java index 25525d0..2db7037 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java @@ -219,6 +219,12 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl staffCustomers = staffCustomerService.selectStaffCustomerByStaffIdAndParkId(sysUser.getId(),parkId); + log.info("用户信息为staffCustomers+++++++++++++++:{}",staffCustomers); + if (CollUtil.isEmpty(staffCustomers)) { + throw new RuntimeException("外部人员注册，请联系管理员"); + } + } + User user = new User(); PublishFactory.recordLoginInfo(sysUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); BeanUtils.copyBeanProp(user, sysUser); @@ -125,7 +135,6 @@ public class WxLoginAPIController extends BaseController { ajax.put(Constants.TOKEN, token); ajax.put("user", sysUser); ajax.put("openid", openid); - return ajax; } ajax.put("openid", openid); @@ -151,6 +160,9 @@ public class WxLoginAPIController extends BaseController { throw new RuntimeException("请传递code"); } if (StringUtils.isBlank(openid)) { + if (parkId.equals("26")){ + throw new RuntimeException("外部人员注册，请联系管理员"); + } throw new RuntimeException("请传递openid"); } // 获取微信小程序 AccessToken diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java index 6eb694c..c443818 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java @@ -217,6 +217,8 @@ public class ApiRoomContentController extends BaseController { Assert.isFalse(b, "会议室不可用"); IcsCustomerStaff customerStaff = customerStaffService.selectIcsCustomerStaffById(reservation.getUserId()); Assert.isTrue(customerStaff != null, "用户不存在"); + reservation.setCreateTime(new Date()); + reservation.setCreateBy(customerStaff.getUsername()); boolean save = reservationService.save(reservation); Assert.isTrue(save, "预约失败"); diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiShowroomController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiShowroomController.java index 5dc814d..43cba33 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiShowroomController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiShowroomController.java @@ -72,7 +72,7 @@ public class ApiShowroomController extends BaseController { //查询楼层号 BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId()); if (buildingDetail != null) { - showroom.setBuildingName(buildingDetail.getFloorName() +"F"); + showroom.setBuildingName(buildingDetail.getFloorName()); } } } @@ -96,7 +96,7 @@ public class ApiShowroomController extends BaseController { //查询楼层号 BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId()); if (buildingDetail != null) { - showroom1.setBuildingName(buildingDetail.getFloorName() +"F"); + showroom1.setBuildingName(buildingDetail.getFloorName()); } } }