diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index 3807d9e..b63c2e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -148,11 +148,11 @@ public class ResidentsArchiveController extends BaseController { */ @RequestMapping(value = "/residentsArchiveExport", method = RequestMethod.GET) @ResponseBody -// @TokenRequired + @TokenRequired public void residentsArchiveExport(@Valid ResidentsArchiveQueryRequest residentsArchiveQueryRequest,HttpServletResponse response, HttpServletRequest request){ -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,856,response); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,loginState.getId(),response); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index 43f4afe..3611346 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -176,14 +176,17 @@ public class FunvCommonUtil { Map temp = (Map)ma.getValue(); Set> data = temp.entrySet(); Iterator> it2 = data.iterator(); - boolean b = false; + boolean a = false; + String proName = null; + while (it2.hasNext()) { + Map.Entry mm = it2.next(); if ("checkBox".equals(mm.getKey())){ boolean v = (Boolean)mm.getValue(); if (v){ - b = v; + a = v; continue; }else { break; @@ -191,15 +194,21 @@ public class FunvCommonUtil { } if ("proName".equals(mm.getKey())){ proName = (String)mm.getValue(); - sb.append(mm.getValue() + "").append("["); + sb.append(mm.getValue() + "").append("[").append("]"); } - if ("selected".equals(mm.getKey()) && b){ + + if ("selected".equals(mm.getKey()) && a){ + + if (sb.toString().endsWith("]")){ + String ss = sb.substring(0, sb.length() - 1); + sb = new StringBuilder(ss); + } if (proName!=null && "其他".equals(proName)){ String v = (String)mm.getValue(); sb.append(v).append("]"); }else { - List ids = (List)mm.getValue(); + Listids = (List)mm.getValue(); if (ids.size()!=0){ for (String id : ids){ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); @@ -207,10 +216,12 @@ public class FunvCommonUtil { sb.append(basicConfig.getName()).append(","); } } - String ss = sb.substring(0, sb.length() - 1); - sb = new StringBuilder(ss); - sb.append("]"); + if (sb.toString().endsWith(",")) { + String ss = sb.substring(0, sb.length() - 1); + sb = new StringBuilder(ss); + } } + sb.append("]"); } } }