傅行帆 5 lat temu
rodzic
commit
5f1e503886

+ 20
- 0
src/main/java/com/huiju/estateagents/base/BaseController.java Wyświetl plik

1
 package com.huiju.estateagents.base;
1
 package com.huiju.estateagents.base;
2
 
2
 
3
+import com.huiju.estateagents.common.JWTUtils;
4
+
5
+import javax.servlet.http.HttpServletRequest;
6
+import java.util.Map;
7
+
3
 /**
8
 /**
4
  * @author FXF
9
  * @author FXF
5
  * @date 2018-12-18
10
  * @date 2018-12-18
6
  */
11
  */
7
 public class BaseController {
12
 public class BaseController {
13
+	
14
+	/**
15
+	 * 获取orgId
16
+	 * @param request
17
+	 * @return
18
+	 */
19
+	public Integer getOrgId(HttpServletRequest request){
20
+		
21
+		Map map = JWTUtils.getUserIdAndOrgId(request);
22
+		if (null != map && null != map.get("orgId")){
23
+			return Integer.valueOf(map.get("orgId").toString());
24
+		}
25
+		
26
+		return null;
27
+	}
8
 }
28
 }

+ 6
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Wyświetl plik

33
 import java.util.Date;
33
 import java.util.Date;
34
 import java.util.HashMap;
34
 import java.util.HashMap;
35
 import java.util.List;
35
 import java.util.List;
36
+import java.util.Map;
36
 
37
 
37
 /**
38
 /**
38
  * <p>
39
  * <p>
197
 
198
 
198
 
199
 
199
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
200
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
200
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
201
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
201
         ResponseBean responseBean = new ResponseBean();
202
         ResponseBean responseBean = new ResponseBean();
202
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
203
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
204
+        dynamic.setOrgId(getOrgId(request));
203
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
205
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
204
         dynamic.setCityId(cityId);
206
         dynamic.setCityId(cityId);
205
         dynamic.setStatus(1);
207
         dynamic.setStatus(1);
211
     }
213
     }
212
 
214
 
213
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
215
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
214
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
216
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
215
         ResponseBean responseBean = new ResponseBean();
217
         ResponseBean responseBean = new ResponseBean();
216
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
218
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
219
+        Map map = JWTUtils.getUserIdAndOrgId(request);
220
+        dynamic.setOrgId(Integer.valueOf(map.get("orgId").toString()));
217
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
221
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
218
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
222
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
219
         dynamic.setCityId(cityId);
223
         dynamic.setCityId(cityId);