From d73687bc6115007145b4aab050e4e29ff87fd8ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 三月 2021 18:44:36 +0800
Subject: [PATCH] 布丸代码优化
---
src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
index 69fdbdb..5d3d006 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
@@ -6,8 +6,10 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
import javax.validation.Valid;
+import com.yeshi.buwan.util.SystemUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -55,11 +57,11 @@
}
@RequestMapping(value = "/gethometypelistadmin", method = RequestMethod.POST)
- public void getHomeTypeListAdmin(int page, int detailsystem, String key, PrintWriter out) {
+ public void getHomeTypeListAdmin(int page, int detailsystem, String key, HttpSession session, PrintWriter out) {
key = StringUtil.isNullOrEmpty(key) ? "" : key;
- List<HomeTypeAdmin> list = homeTypeService.getHomeTypeAdmin(key, detailsystem, page);
- long count = homeTypeService.getHomeTypeAdminCount(key, detailsystem);
+ List<HomeTypeAdmin> list = homeTypeService.getHomeTypeAdmin(key, SystemUtil.getAdminSelectedSystemId(session), detailsystem, page);
+ long count = homeTypeService.getHomeTypeAdminCount(key, SystemUtil.getAdminSelectedSystemId(session), detailsystem);
PageEntity pe = new PageEntity();
pe.setPageIndex(page);
pe.setPageSize(Constant.pageCount);
@@ -68,6 +70,7 @@
Gson gson = new GsonBuilder().create();
for (HomeTypeAdmin ht : list) {
JSONObject root = new JSONObject();
+ ht.getHomeType().getHomeType().getSystem().setAdmin(null);
root.put("homeType", gson.toJson(ht.getHomeType().getHomeType()));
JSONArray darray = new JSONArray();
for (DetailSystemSelect dss : ht.getDetailSystemList()) {
--
Gitblit v1.8.0