diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index 937c735..51104fb 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -521,6 +521,9 @@ public class AdministerServiceImpl extends ServiceImpl departmentDictDOS = memberMapper.getDepartments(classDetailVO.getId()); + classDetailVO.setDeps(departmentDictDOS); } classDetailVOIPage.setRecords(classDetailVOS); return classDetailVOIPage; diff --git a/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java b/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java index 66ba41f..e93bcab 100644 --- a/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java +++ b/src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java @@ -1,5 +1,6 @@ package com.subsidy.vo.classdict; +import com.subsidy.model.DepartmentDictDO; import com.subsidy.util.excel.ExcelColumn; import com.subsidy.vo.done.GetMaxScoreVO; import lombok.Data; @@ -90,4 +91,5 @@ public class ClassDetailVO{ private List getMaxScoreVOS; + private List deps; } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index cbbe544..441d9b9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ # 本地环境配置 -spring.server.port=23457 +spring.server.port=23462 # 数据源配置 -spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver