diff --git a/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java b/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java index c649fb55..72d79fe5 100644 --- a/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java @@ -2,6 +2,7 @@ package com.peanut.modules.common.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.peanut.common.utils.HttpContextUtil; import com.peanut.common.utils.R; import com.peanut.common.utils.ShiroUtils; import com.peanut.config.Constants; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -60,10 +62,25 @@ public class TrainingClassController { //培训班列表 @RequestMapping("/trainingClassList") public R trainingClassList(@RequestBody Map params) { + //根部不同平台返回不同列表 + HttpServletRequest request = HttpContextUtil.getHttpServletRequest(); + String displayApp = ""; + String appType = request.getHeader("appType")==null?"":request.getHeader("appType"); + if ("".equals(appType)){ + displayApp = "0"; + }else if ("medical".equals(appType)){ + displayApp = "2"; + }else if ("sociology".equals(appType)){ + displayApp = "1"; + }else if ("psyche".equals(appType)){ + displayApp = "3"; + }else if ("taihumed".equals(appType)){ + displayApp = "4"; + } List trainingClassList = trainingClassService.list(new LambdaQueryWrapper() .eq(TrainingClass::getDisplayFlag,0) .eq(StringUtils.isNotEmpty(params.get("year").toString()),TrainingClass::getYear,params.get("year")) - .like(params.containsKey("displayApp"),TrainingClass::getDisplayApp,params.get("displayApp")) + .like(!"".equals(displayApp),TrainingClass::getDisplayApp,displayApp) .orderByDesc(TrainingClass::getSingupFlag) .orderByAsc(TrainingClass::getSort)); for (TrainingClass trainingClass : trainingClassList) {