From b7a6008d783b4c90264bd26e772a7b2c8cacc0f3 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 7 Mar 2025 14:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=8D=A1=E5=8A=9E=E8=AF=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jysoft/card/service/NewCardService.java   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java
index 371cbf5..d961239 100644
--- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java
+++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java
@@ -54,6 +54,7 @@ public class NewCardService {
 	@SuppressWarnings("unchecked")
 	public RestResult getAuditCheckUser(CardVo vo) {
 		try {
+			List<Map<String, String>> list = getDeptByUser(vo);
 			List<CardAuditVo> dataList = new ArrayList<CardAuditVo>();
 			List<Object> parameter = new ArrayList<Object>();
 			String sql = " SELECT ghc.CHECK_ID AS \"checkId\"," + " ghcd.CHECK_ROLE AS \"checkRole\","
@@ -61,10 +62,11 @@ public class NewCardService {
 					+ " FROM GREEN_HOUSE_CHECK ghc"
 					+ " LEFT JOIN GREEN_HOUSE_CHECK_DETAILS ghcd ON ghc.CHECK_ID = ghcd.CHECK_ID"
 					+ " LEFT JOIN GREEN_HOUSE_CHECK_ROLE ghcr ON ghcd.CHECK_ROLE = ghcr.ROLE_ID"
-					+ " LEFT JOIN GREEN_USER_INFO gui ON gurr.USER_ID = gui.ID"
-					+ "	WHERE ghc.CHECK_NAME = ? AND CHECK_SORT = '1'";
+					+ " LEFT JOIN GREEN_USER_INFO gui ON ghcr.USER_ID = gui.ID"
+					+ "	WHERE ghc.CHECK_NAME = ? AND gui.DEPARTMENT_ID = ? AND CHECK_SORT = '1'";
 			System.err.println(sql);
 			parameter.add(vo.getCardType());
+			parameter.add(list.get(0).get("departmentId"));
 			dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),
 					new BeanPropertyRowMapper<CardAuditVo>(CardAuditVo.class));
 			return new RestResult(Constant.SUCCESS, "查询成功", dataList);
@@ -1356,6 +1358,25 @@ public class NewCardService {
 		}
 	}
 	
+	/**
+	 * 查询当前登录人所在部门
+	 * @param vo
+	 * @return
+	 */
+	public List<Map<String, String>> getDeptByUser(CardVo vo) {
+		try {
+			List<Object> parameter = new ArrayList<Object>();
+			String sql = "SELECT ID AS \"id\",DEPARTMENT_ID AS \"departmentId\""
+					+ " FROM GREEN_USER_INFO WHERE ID = ? AND IS_DELETED = 'N'";
+			parameter.add(vo.getUserId());
+			List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,parameter.toArray());
+			return list;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+	
 	/**
 	 * 处理占位符
 	 * @return