Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
email
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈天仲
email
Commits
d2d454af
Commit
d2d454af
authored
Aug 08, 2024
by
luotm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复邮件搜索接收人字段匹配错误导致无法查询到数据的问题
parent
11e11eb1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
src/main/java/com/zq/email/controller/EmailManageController.java
+8
-2
src/main/java/com/zq/email/service/impl/EmailAttachServiceImpl.java
+2
-2
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
+2
-2
src/main/resources/mapper/EmailPersonMapper.xml
+0
-2
No files found.
src/main/java/com/zq/email/controller/EmailManageController.java
View file @
d2d454af
...
...
@@ -48,7 +48,10 @@ public class EmailManageController {
@PostMapping
(
"total"
)
public
ResultVo
total
(
@RequestBody
EmailSearchReqVo
vo
)
{
vo
.
setFolderId
(
EmailFolderEnum
.
FOLDER_ALREADY_SEND
.
getKey
());
AssertUtils
.
notNull
(
vo
.
getSendUserId
(),
"缺少参数:sendUserId"
);
if
(
null
==
vo
.
getSendUserId
()
&&
null
==
vo
.
getReceiveUserId
()){
AssertUtils
.
notNull
(
vo
.
getSendUserId
(),
"缺少参数:sendUserId"
);
AssertUtils
.
notNull
(
vo
.
getReceiveUserId
(),
"缺少参数:receiveUserId"
);
}
return
ResultVo
.
success
(
emailPersonService
.
emailManageCount
(
vo
));
}
...
...
@@ -56,7 +59,10 @@ public class EmailManageController {
@PostMapping
(
"page"
)
public
ResultVo
page
(
@RequestBody
EmailSearchReqVo
vo
)
{
vo
.
setFolderId
(
EmailFolderEnum
.
FOLDER_ALREADY_SEND
.
getKey
());
AssertUtils
.
notNull
(
vo
.
getSendUserId
(),
"缺少参数:sendUserId"
);
if
(
null
==
vo
.
getSendUserId
()
&&
null
==
vo
.
getReceiveUserId
()){
AssertUtils
.
notNull
(
vo
.
getSendUserId
(),
"缺少参数:sendUserId"
);
AssertUtils
.
notNull
(
vo
.
getReceiveUserId
(),
"缺少参数:receiveUserId"
);
}
return
ResultVo
.
success
(
emailPersonService
.
emailManagePage
(
vo
));
}
...
...
src/main/java/com/zq/email/service/impl/EmailAttachServiceImpl.java
View file @
d2d454af
...
...
@@ -302,9 +302,9 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
String
download
=
emailAttach
.
getDownloadPath
();
byte
[]
bytes
=
null
;
if
(
profile
.
equals
(
"wanpro"
)
||
profile
.
equals
(
"wantest"
))
{
download
=
download
.
replaceAll
(
"147.2.3.
3
"
,
"172.28.1.71"
);
download
=
download
.
replaceAll
(
"147.2.3.
2
"
,
"172.28.1.71"
);
}
else
{
download
=
download
.
replaceAll
(
"172.28.1.71"
,
"147.2.3.
3
"
);
download
=
download
.
replaceAll
(
"172.28.1.71"
,
"147.2.3.
2
"
);
}
try
{
bytes
=
HttpUtil
.
downloadBytes
(
download
);
...
...
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
View file @
d2d454af
...
...
@@ -174,7 +174,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
@Override
public
Integer
emailManageCount
(
EmailSearchReqVo
vo
)
{
vo
.
setUserId
(
vo
.
getSendUserId
());
//
vo.setUserId(vo.getSendUserId());
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_SEND
);
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
Integer
total
=
this
.
baseMapper
.
selectSearchTotal
(
vo
);
...
...
@@ -184,7 +184,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
@Override
public
Page
<
EmailPerson
>
emailManagePage
(
EmailSearchReqVo
vo
)
{
vo
.
setUserId
(
vo
.
getSendUserId
());
//
vo.setUserId(vo.getSendUserId());
vo
.
setPersonType
(
EmailConstant
.
TYPE_EMAIL_SEND
);
vo
.
setIsSend
(
WhetherEnum
.
YES
.
getKey
());
...
...
src/main/resources/mapper/EmailPersonMapper.xml
View file @
d2d454af
...
...
@@ -51,7 +51,6 @@
"EMAIL_PERSON" EP2
WHERE
EP2."PERSON_TYPE" = 2
AND EP2."IS_SEND" = 1
AND EP2."USER_ID" = #{s.receiveUserId}
)
</if>
...
...
@@ -143,7 +142,6 @@
"EMAIL_PERSON" EP2
WHERE
EP2."PERSON_TYPE" = 2
AND EP2."IS_SEND" = 1
AND EP2."USER_ID" = #{s.receiveUserId}
)
</if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment