From 24a7d01b8c568a785fa88b809778a4adb13f7f5c Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Tue, 20 Feb 2024 16:43:10 +0800
Subject: [PATCH] =?UTF-8?q?app=E9=A6=96=E9=A1=B5=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=95=B0=E6=8D=AE=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/app/AppHiddenController.java | 14 +++++++-------
 .../mybatis/datasource/check/ListManagerMapper.xml | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java
index 2ea53d8..0b8d38f 100644
--- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java
+++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java
@@ -147,15 +147,15 @@ public class AppHiddenController extends BaseController {
 				}
 			}
 
-			List<PageData> checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5
-//			List<PageData> checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页）
+//			List<PageData> checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5
+			List<PageData> checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页）
 			for (int i = 0; i < checkorHid.size(); i++) {
 				PageData che = checkorHid.get(i);
 				if (null == che.get("STATE")) {
 					continue;
 				}
-				if (che.get("STATE").equals("2")) {  //原来是3，但是手机端待验收数据与列表数据不对。调整为2
-//				if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
+//				if (che.get("STATE").equals("2")) {  //原来是3，但是手机端待验收数据与列表数据不对。调整为2
+				if (che.get("STATE").equals("3") && pd.getString("USER_ID").equals(che.get("CHECKOR"))) {
 					dys++;
 				}
 			}
@@ -186,9 +186,9 @@ public class AppHiddenController extends BaseController {
 					yq++;
 				}
 			}
-
-			List<PageData> creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息
-//			List<PageData> creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页）
+			pd.put("APPSELFUSERID", pd.get("userId"));
+//			List<PageData> creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息
+			List<PageData> creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页）
 			System.out.println(creatorHid);
 			for (int i = 0; i < creatorHid.size(); i++) {
 				PageData cre = creatorHid.get(i);
diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
index 76426a6..b54a70e 100644
--- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
+++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
@@ -3246,9 +3246,9 @@
 				and
 				f.CORPINFO_ID = #{CORPINFO_ID}
 			</if>
-			<!--		<if test="USER_ID != null and USER_ID != ''">&lt;!&ndash; 部门查询条件 &ndash;&gt;-->
-			<!--			and f.USER_ID = #{USER_ID}-->
-			<!--		</if>-->
+					<if test="USER_ID != null and USER_ID != ''"><!-- 部门查询条件 -->
+						and f.USER_ID = #{USER_ID}
+					</if>
 			<choose>
 				<when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'>
 					<choose>
@@ -3375,9 +3375,9 @@
 			<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
 				and f.CORPINFO_ID = #{CORPINFO_ID}
 			</if>
-			<!--		<if test="USER_ID != null and USER_ID != ''">&lt;!&ndash; 部门查询条件 &ndash;&gt;-->
-			<!--			and f.USER_ID = #{USER_ID}-->
-			<!--		</if>-->
+			<if test="USER_ID != null and USER_ID != ''"><!-- 部门查询条件 -->
+				and f.USER_ID = #{USER_ID}
+			</if>
 			<choose>
 				<when test='ISSUPERVISE != null and ISSUPERVISE != "" and ISSUPERVISE == "1"'>
 					<choose>