Commit dacabc54 authored by chenzhao's avatar chenzhao

修改bug

parent 9d5dee2f
......@@ -43,9 +43,7 @@ public class EquipmentServiceImpl {
ResponseModel<Object> response = equipFeignClient.getFireSystemListAll();
List<Map<String, Object>> fireSystemMapList = (List<Map<String, Object>>) response.getResult();
List<MenuFrom> fireSystemDtoList = Lists.newArrayList();
fireSystemMapList.stream().filter(
result -> result.get("bizOrgCode") != null && result.get("bizOrgCode").toString().startsWith(reginParams.getPersonIdentity().getBizOrgCode()))
.forEach(
fireSystemMapList.stream().forEach(
system -> {
MenuFrom menuFrom = new MenuFrom((String) system.get("id"), (String) system.get("name"), "0", "0");
fireSystemDtoList.add(menuFrom);
......
......@@ -23,6 +23,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.context.RequestContext;
......@@ -412,7 +413,8 @@ public class ExcelServiceImpl {
break;
}
}
@Transactional
public void commonUpload(MultipartFile multipartFile, ExcelDto excelDto,String uuidString) throws Exception {
switch (excelDto.getType()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment