From 1f869d1e5c9361645e7be28d2c27407d838a7d22 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Jan 2024 11:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/service/IGridmanService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/service/IGridmanService.java b/src/main/java/org/springblade/modules/grid/service/IGridmanService.java
index 4ac16b0..a39dfb2 100644
--- a/src/main/java/org/springblade/modules/grid/service/IGridmanService.java
+++ b/src/main/java/org/springblade/modules/grid/service/IGridmanService.java
@@ -17,6 +17,8 @@
 package org.springblade.modules.grid.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
 import org.springblade.modules.grid.entity.GridmanEntity;
 import org.springblade.modules.grid.excel.GridmanExcel;
 import org.springblade.modules.grid.vo.GridmanVO;
@@ -69,4 +71,13 @@
 	 * 网格员表 自定义详情
 	 */
 	GridmanVO getDetail(GridmanEntity gridman);
+
+	/**
+	 * 查询网格id
+	 * @param userId
+	 * @return
+	 */
+    Integer getGridIdByUserId(Long userId);
+
+	List<UserEntity> getGridManByCode(String houseCode);
 }

--
Gitblit v1.9.3