暂存

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<R> 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<EmailMaintainExcel> 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);

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);
     }
 

dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java

@@ -192,11 +192,12 @@ public class SnEmailGatherTask {
                     List<Map<String, String>> mapList = Lists.newArrayList();
                     EmailParseUtils.saveAttachment(msg, mapList);
                     log.debug("获取附件的数量："+mapList.size());
-                    if(StringUtils.isNotEmpty(maintainVo.getUserId())){
+                    if(StringUtils.isNotEmpty(maintainVo.getCreateUser())){
-                        String username = emailMaintainService.getUserByUsername(maintainVo.getUserId());
+//                        String username = emailMaintainService.getUserByUsername(maintainVo.getUserId());
-                        if(StringUtils.isNotEmpty(username)){
+//                        if(StringUtils.isNotEmpty(username)){
-                            maintainVo.setUserId(username);
+//                            maintainVo.setUserId(username);
-                        }
+//                        }
+                        maintainVo.setUserId(maintainVo.getCreateUser());
                     }
                     for (Map<String, String> map : mapList) {
                         map.put("emailName",emailName);

dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml

@@ -168,8 +168,12 @@
         select username from sys_user where loginname = #{userCode}
     </select>
 
+<!--    <select id="getUserByUsername" resultType="java.lang.String">-->
+<!--        select code from sys_user where username = #{username}-->
+<!--    </select>-->
+
     <select id="getUserByUsername" resultType="java.lang.String">
-        select code from sys_user where username = #{username}
+        select loginname from sys_user where username = #{username}
     </select>
 
     <select id="selectByEmail" resultType="java.lang.Integer">