From 50fdcb14bcd0ba57181d434a96d7d416edf1c29d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 17 Sep 2021 10:44:29 +0800
Subject: [PATCH] 考试,通知公告,派遣记录,单位,保安公司统计接口同步

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index cd5ef68..8b0d132 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -1145,21 +1145,24 @@
 			}
 			String deptid = strArrays.substring(0, strArrays.length() - 1);
 			Map<String, Object> map = new HashMap<String, Object>();
-			Map<Object, Object> objectStringMap = iDeptService.selectHold(deptid);
-			if (objectStringMap == null) {
+			List<Map<String, Object>> objectStringMap = iDeptService.selectHold(deptid);
+			if (objectStringMap.size()==0) {
 				map.put("name", list.get(i).get("deptname"));
 				map.put("cz", cznumber);
 				map.put("wcz", wcznumber);
 				lists.add(map);
 			} else {
-				String cz = objectStringMap.get("cz").toString();
-				cznumber = Integer.valueOf(cz);
-				String wcz = objectStringMap.get("wcz").toString();
-				wcznumber = Integer.valueOf(wcz);
+				for (int c=0;c<objectStringMap.size();c++){
+					String cz = objectStringMap.get(c).get("cz").toString();
+					cznumber += Integer.valueOf(cz);
+					String wcz = objectStringMap.get(c).get("wcz").toString();
+					wcznumber += Integer.valueOf(wcz);
+				}
 				map.put("name",  list.get(i).get("deptname"));
 				map.put("cz", cznumber);
 				map.put("wcz", wcznumber);
 				lists.add(map);
+
 			}
 		}
 		return R.data(lists);

--
Gitblit v1.9.3