gaodd 1 ano atrás
pai
commit
530d0ace00

+ 4 - 4
src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -273,13 +273,13 @@ public class OrgInfoController {
273 273
 
274 274
 	//所属组织
275 275
 	@RequestMapping("/getTreeListByOrgId")
276
-	public Map<String, Object> getTreeListByOrgId(HttpServletRequest request) {
276
+	public Map<String, Object> getTreeListByOrgId(HttpServletRequest request,Integer orgId) {
277 277
 		Map<String, Object> modelMap = new HashMap<>();
278 278
 		try {
279
-			ObjectMapper mapper = new ObjectMapper();
279
+			/*ObjectMapper mapper = new ObjectMapper();
280 280
 			String orgInfoObject = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
281 281
 			OrgInfo depotInfo = mapper.readValue(orgInfoObject, OrgInfo.class);
282
-			Integer orgId = depotInfo.getOrgId();
282
+			Integer orgId = depotInfo.getOrgId();*/
283 283
 			
284 284
 			if (orgId == null) {
285 285
 				return modelMap;
@@ -296,7 +296,7 @@ public class OrgInfoController {
296 296
 			}
297 297
 			modelMap.put("orgList", voList);
298 298
 			modelMap.put("orgId", orgId);
299
-		} catch (IOException e) {
299
+		} catch (Exception e) {
300 300
 			e.printStackTrace();
301 301
 		}
302 302
 		return modelMap;