diff --git a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java index bb8afe85..a227a076 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java @@ -1,7 +1,11 @@ package com.ibeetl.jlw.web; +import cn.jlw.Interceptor.SCoreUser; +import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.UniversitiesColleges; import com.ibeetl.jlw.service.StatisticalAnalysisService; +import com.ibeetl.jlw.service.UniversitiesCollegesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -23,6 +27,8 @@ public class StatisticalAnalysisController { @Autowired private StatisticalAnalysisService statisticalAnalysisService; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; /** * 统计分析数据 @@ -52,16 +58,14 @@ public class StatisticalAnalysisController { * 管理员端首页查询 * @param stime 开始时间 * @param etime 结束时间 - * @param universitiesCollegesId 院校id * @return */ @RequestMapping("/adminIndexDetail.do") public JsonResult adminIndexDetail(@RequestParam(value = "stime", required = false) Date stime, @RequestParam(value = "etime", required = false) Date etime, - @RequestParam(value = "universitiesCollegesId", required = false) Long universitiesCollegesId - - ) { - Map detail = statisticalAnalysisService.adminIndexDetail(stime, etime, universitiesCollegesId); + @SCoreUser CoreUser coreUser) { + UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); + Map detail = statisticalAnalysisService.adminIndexDetail(stime, etime, uc.getUniversitiesCollegesId()); return JsonResult.success(detail); }