jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 07d60b641600af08ab0639f6f2e460342100a0ca

Authored by jiangjiazhi
2 parents a068f0e253 8e5204c389
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ 07d60b6
... ... @@ -148,11 +148,11 @@
148 148 */
149 149 @RequestMapping(value = "/residentsArchiveExport", method = RequestMethod.GET)
150 150 @ResponseBody
151   -// @TokenRequired
  151 + @TokenRequired
152 152 public void residentsArchiveExport(@Valid ResidentsArchiveQueryRequest residentsArchiveQueryRequest,HttpServletResponse response,
153 153 HttpServletRequest request){
154   -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
155   - residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,856,response);
  154 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  155 + residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,loginState.getId(),response);
156 156 }
157 157  
158 158 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java View file @ 07d60b6
... ... @@ -176,14 +176,17 @@
176 176 Map temp = (Map)ma.getValue();
177 177 Set<Map.Entry<String, Object>> data = temp.entrySet();
178 178 Iterator<Map.Entry<String, Object>> it2 = data.iterator();
179   - boolean b = false;
  179 + boolean a = false;
  180 +
180 181 String proName = null;
  182 +
181 183 while (it2.hasNext()) {
  184 +
182 185 Map.Entry<String, Object> mm = it2.next();
183 186 if ("checkBox".equals(mm.getKey())){
184 187 boolean v = (Boolean)mm.getValue();
185 188 if (v){
186   - b = v;
  189 + a = v;
187 190 continue;
188 191 }else {
189 192 break;
190 193  
191 194  
192 195  
... ... @@ -191,15 +194,21 @@
191 194 }
192 195 if ("proName".equals(mm.getKey())){
193 196 proName = (String)mm.getValue();
194   - sb.append(mm.getValue() + "").append("[");
  197 + sb.append(mm.getValue() + "").append("[").append("]");
195 198 }
196   - if ("selected".equals(mm.getKey()) && b){
197 199  
  200 + if ("selected".equals(mm.getKey()) && a){
  201 +
  202 + if (sb.toString().endsWith("]")){
  203 + String ss = sb.substring(0, sb.length() - 1);
  204 + sb = new StringBuilder(ss);
  205 + }
  206 +
198 207 if (proName!=null && "其他".equals(proName)){
199 208 String v = (String)mm.getValue();
200 209 sb.append(v).append("]");
201 210 }else {
202   - List<String> ids = (List<String>)mm.getValue();
  211 + List<String>ids = (List<String>)mm.getValue();
203 212 if (ids.size()!=0){
204 213 for (String id : ids){
205 214 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
206 215  
... ... @@ -207,10 +216,12 @@
207 216 sb.append(basicConfig.getName()).append(",");
208 217 }
209 218 }
210   - String ss = sb.substring(0, sb.length() - 1);
211   - sb = new StringBuilder(ss);
212   - sb.append("]");
  219 + if (sb.toString().endsWith(",")) {
  220 + String ss = sb.substring(0, sb.length() - 1);
  221 + sb = new StringBuilder(ss);
  222 + }
213 223 }
  224 + sb.append("]");
214 225 }
215 226 }
216 227 }