diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java index 906245d7..4f58914a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java @@ -88,5 +88,6 @@ public interface EmailMaintainDao extends BaseMapper { String getUserName(@Param("userCode") String userCode); + String getUserByUsername(@Param("username") String username); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java index 39d12fe3..9db4ec0f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java @@ -49,6 +49,7 @@ public interface EmailMaintainService { boolean deleteById(String id); String getUserName(String userCode); + String getUserByUsername(String username); int insertBatch(List entities); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index 4d678356..4b4f190b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -121,6 +121,13 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { return emailMaintainDao.getUserName(userCode); } + + @Override + public String getUserByUsername(String username) { + DynamicContextHolder.push("business_itax_read"); + return emailMaintainDao.getUserByUsername(username); + } + @Override public int insertBatch(List entities) { return emailMaintainDao.insertBatch(entities); diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java index 3d8c9547..6df7e37d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java @@ -167,6 +167,12 @@ public class SnEmailGatherTask { List> mapList = Lists.newArrayList(); EmailParseUtils.saveAttachment(msg, mapList); log.debug("获取附件的数量:"+mapList.size()); + if(StringUtils.isNotEmpty(maintainVo.getUserId())){ + String username = emailMaintainService.getUserByUsername(maintainVo.getUserId()); + if(StringUtils.isNotEmpty(username)){ + maintainVo.setUserId(username); + } + } for (Map map : mapList) { map.put("emailName",emailName); String pdfStream = map.get("pdfStream"); @@ -238,7 +244,7 @@ public class SnEmailGatherTask { mailGatherLogService.insert(gatherLogVo); } - public static Map convertToOcrResult(List openServiceOcrs, Map map,EmailMaintainVo maintainVo){ + public Map convertToOcrResult(List openServiceOcrs, Map map,EmailMaintainVo maintainVo){ List resultToyxVoList = Lists.newArrayList(); Map hashMap = Maps.newHashMap(); String batchId = String.valueOf(System.currentTimeMillis()); @@ -260,7 +266,6 @@ public class SnEmailGatherTask { resultToyxVo.setFileByte(map.get("pdfStream")); resultToyxVo.setEmail(map.get("emailName")); resultToyxVo.setEmployeeId(maintainVo.getUserId()); - resultToyxVoList.add(resultToyxVo); } hashMap.put("list",resultToyxVoList); diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index 0d695302..f9ea5525 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -165,6 +165,10 @@ select username from sys_user where loginname = #{userCode} + +