From 1afe400ff840991d665b0476d86da03ee9fe154c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Mon, 13 Jan 2025 10:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contraller/MaintenanceController.java     | 20 ++++++++-----------
 .../service/impl/DeviceServiceImpl.java       |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
index 92f6335..222450d 100644
--- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
@@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -30,8 +28,6 @@ import org.springblade.modules.business.service.*;
 import org.springblade.modules.business.sms.SmsService;
 import org.springblade.modules.system.pojo.entity.User;
 import org.springblade.modules.system.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,11 +64,11 @@ public class MaintenanceController extends BladeController {
     @GetMapping("/plan-page")
     @Operation(summary = "维保计划列表", description = "维保计划列表")
     public R<IPage<MaintenancePlan>> planPage(MaintenancePlan plan, Query query) {
-        BladeUser user = AuthUtil.getUser();
-
+        BladeUser bladeUser = AuthUtil.getUser();
+        User user = userService.getById(AuthUtil.getUserId());
         LambdaQueryWrapper<MaintenancePlan> wrapper = Wrappers.lambdaQuery(plan).orderByDesc(MaintenancePlan::getCreateTime);
-        if(!user.getRoleName().contains("administrator") && !user.getRoleName().contains("admin")){
-            wrapper.eq(MaintenancePlan::getDeptId,user.getDeptId());
+        if (!bladeUser.getRoleName().contains("administrator") && !bladeUser.getRoleName().contains("admin") && !user.getRoleId().equals("1839536982874193922")) {
+            wrapper.eq(MaintenancePlan::getDeptId, bladeUser.getDeptId());
         }
         IPage<MaintenancePlan> pages = this.planService.page(Condition.getPage(query), wrapper);
         return R.data(pages);
@@ -134,10 +130,10 @@ public class MaintenanceController extends BladeController {
         if (Func.isNotEmpty(task.getStatusSearch())) {
             wrapper.in(MaintenanceTask::getTaskStatus, task.getStatusSearch().split(","));
         }
-        if(user.getRoleName().equals("维修人员")){
-            List<String> taskStatusList = Arrays.asList(new String[]{"1","2","3","4"});
-            wrapper.in(MaintenanceTask::getTaskStatus,taskStatusList);
-            wrapper.eq(MaintenanceTask::getServicemanId,user.getUserId());
+        if (user.getRoleName().equals("维修人员")) {
+            List<String> taskStatusList = Arrays.asList(new String[]{"1", "2", "3", "4"});
+            wrapper.in(MaintenanceTask::getTaskStatus, taskStatusList);
+            wrapper.eq(MaintenanceTask::getServicemanId, user.getUserId());
         }
         wrapper.like(StringUtils.isNotBlank(task.getDeptName()), MaintenanceTask::getDeptName, task.getDeptName());
         IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper);
diff --git a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java
index 33c4f2f..1c9c334 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java
@@ -212,7 +212,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, Device> imp
         LambdaQueryWrapper<Device> wrapper = Wrappers.lambdaQuery(Device.class)
                 .eq(Device::getLimsId, device.getLimsId())
                 .eq(Device::getFloorId, device.getFloorId())
-                .eq(Device::getIsWarran, 0)
+//                .eq(Device::getIsWarran, 0)
                 .eq(Device::getRoomId, device.getRoomId());
         List<Device> devices = this.list(wrapper);