From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/safety/service/impl/SafetyWorkAreaServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/service/impl/SafetyWorkAreaServiceImpl.java b/src/main/java/com/ruoyi/safety/service/impl/SafetyWorkAreaServiceImpl.java
new file mode 100644
index 0000000..21b2510
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/service/impl/SafetyWorkAreaServiceImpl.java
@@ -0,0 +1,31 @@
+package com.ruoyi.safety.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safety.mapper.SafetyWorkAreaMapper;
+import com.ruoyi.safety.pojo.SafetyWorkArea;
+import com.ruoyi.safety.service.SafetyWorkAreaService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SafetyWorkAreaServiceImpl extends SafetyBaseServiceImpl<SafetyWorkAreaMapper, SafetyWorkArea>
+ implements SafetyWorkAreaService {
+
+ @Override
+ public IPage<SafetyWorkArea> queryPage(Page<SafetyWorkArea> page, SafetyWorkArea query) {
+ QueryWrapper<SafetyWorkArea> wrapper = new QueryWrapper<SafetyWorkArea>().orderByDesc("create_time");
+ if (query != null) {
+ if (hasText(query.getName())) {
+ wrapper.like("name", query.getName());
+ }
+ if (hasText(query.getManager())) {
+ wrapper.like("manager", query.getManager());
+ }
+ if (query.getManagerId() != null) {
+ wrapper.eq("manager_id", query.getManagerId());
+ }
+ }
+ return page(page, wrapper);
+ }
+}
--
Gitblit v1.9.3