diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 013b5883..e5259985 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -180,7 +180,8 @@ public class EmailMaintainController extends AbstractController { @RequestMapping("/emailUpload") public ResponseEntity emailUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "deptId") String deptId, - @RequestParam(value = "deptName") String deptName) { + @RequestParam(value = "deptName") String deptName, + @RequestParam (value = "companyCode") String companyCode) { try { List emailMaintainExcels = @@ -237,7 +238,7 @@ public class EmailMaintainController extends AbstractController { EmailMaintainVo maintainVo = new EmailMaintainVo(); maintainVo.setId(UUIDUtils.generateShortUuid()); - maintainVo.setCompanyCode(deptId); + maintainVo.setCompanyCode(companyCode); maintainVo.setDeptId(deptId); maintainVo.setDeptName(deptName); maintainVo.setUsername(userName); 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 96e69b24..087d2e31 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 @@ -125,7 +125,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { @Override public String getUserByUsername(String username) { - DynamicContextHolder.push("business_itax_read"); + DynamicContextHolder.push(DbConstant.BASICS_READ); return emailMaintainDao.getUserByUsername(username); } 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 79c12a8c..35fc58a9 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 @@ -192,11 +192,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); - } + if(StringUtils.isNotEmpty(maintainVo.getCreateUser())){ +// String username = emailMaintainService.getUserByUsername(maintainVo.getUserId()); +// if(StringUtils.isNotEmpty(username)){ +// maintainVo.setUserId(username); +// } + maintainVo.setUserId(maintainVo.getCreateUser()); } for (Map map : mapList) { map.put("emailName",emailName); diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index 8d34677c..a9ab7a55 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -168,8 +168,12 @@ select username from sys_user where loginname = #{userCode} + + + +