From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
index f913147..662f5b3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
@@ -1,8 +1,12 @@
 package cn.gistack.sm.sjztmd.mapper;
 
+import cn.gistack.common.node.TreeNode;
 import cn.gistack.sm.sjztmd.entity.AttAdBase;
 import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -16,4 +20,25 @@
 
 	List<AttAdBaseVO> lazyTree(String parentCode, Map<String, Object> param);
 
+	List<AttAdBaseVO> lazyTreeAll(String parentCode, Map<String, Object> param);
+
+	/**
+	 * 查询区域菜单树-带层级
+	 * @param parentCode
+	 * @param param
+	 * @return
+	 */
+	@MapKey("id")
+	Map<String, TreeNode> selectAttAdBaseTree(String parentCode, Map<String, Object> param);
+
+	/**
+	 * 根据水库编号查询除责任人之外的人员信息
+	 * @param res_cd
+	 * @return
+	 */
+    List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd, @Param("roleName") String areaList);
+
+	AttAdBaseVO getDetail(@Param("attAdBase") AttAdBase attAdBase);
+
+	boolean customizeSave(@Param("attAdBase") AttAdBase attAdBase);
 }

--
Gitblit v1.9.3