From 5256daabe5ca8e221bb2d4dd6c4f9f201b989339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 20 Sep 2023 10:34:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/EmailMaintainController.java | 12 ++++-------- .../mapper/mailGather/EmailMaintainMapper.xml | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) 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 9f7661e9..013b5883 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 @@ -65,15 +65,11 @@ public class EmailMaintainController extends AbstractController { // return ResponseEntity.ok(R.ok().put("data", "")); // } // } - Object deptId = pramsMap.get("deptId"); - if(deptId == null || "".equals(String.valueOf(deptId))){ - return ResponseEntity.ok(R.error("该组织未配置税号，请先联系管理员")); + String companyCode = (String) pramsMap.get("companyCode"); + if(StringUtils.isBlank(companyCode)){ + return ResponseEntity.ok(R.error("组织编码不能为空")); } - if("99".equals(String.valueOf(deptId))){ - pramsMap.put("deptId",""); - } - UserInfo userInfo = getUserInfo(); - log.debug("用户信息：{}", JSONObject.toJSONString(userInfo)); + String loginname = getUserInfo().getLoginname(); pramsMap.put("createUser",loginname); return ResponseEntity.ok(R.ok().put("data",this.emailMaintainService.queryByPage(pramsMap))); diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index f7ba5c48..8d34677c 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -32,8 +32,8 @@ id, dept_id, company_code, dept_name, username, user_id, email_address,email_password, create_time, del_status, modify_time from email_maintain - - and dept_id = #{deptId} + + and company_code = #{companyCode} and username = #{username} From a5bb4b5acc3cff79d4143368c6de7836463e3081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 20 Sep 2023 16:21:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/EmailMaintainController.java | 5 +++-- .../mailGather/impl/EmailMaintainServiceImpl.java | 2 +- .../java/com/dxhy/core/task/SnEmailGatherTask.java | 11 ++++++----- .../mapper/mailGather/EmailMaintainMapper.xml | 6 +++++- 4 files changed, 15 insertions(+), 9 deletions(-) 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} + + + +