|
|
@@ -14,6 +14,7 @@ import com.ym.mec.biz.dal.dao.*;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.*;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
+import com.ym.mec.common.tenant.TenantContextHolder;
|
|
|
import com.ym.mec.util.date.DateUtil;
|
|
|
import com.ym.mec.util.excel.POIUtil;
|
|
|
import com.ym.mec.util.ini.IniFileUtil;
|
|
|
@@ -372,8 +373,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
|
|
|
Map<String, String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.ROUTE_ORDER.getMsg());
|
|
|
List<StudentPaymentRouteOrder> studentPaymentRouteOrders = new ArrayList<>();
|
|
|
- Map<String, Integer> organMap = getMap("organization", "name_", "id_", true,sysUser.getTenantId(), String.class, Integer.class);
|
|
|
- Map<String, Integer> cooperationOrganMap = getMap("cooperation_organ", "name_", "id_", true,sysUser.getTenantId(), String.class, Integer.class);
|
|
|
+ Integer tenantId = TenantContextHolder.getTenantId();
|
|
|
+ Map<String, Integer> organMap = getMap("organization", "name_", "id_", true,tenantId, String.class, Integer.class);
|
|
|
+ Map<String, Integer> cooperationOrganMap = getMap("cooperation_organ", "name_", "id_", true,tenantId, String.class, Integer.class);
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
for (String e : sheetsListMap.keySet()) {
|
|
|
List<Map<String, Object>> sheet = sheetsListMap.get(e);
|
zouxuan