Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
ecd495e9
Commit
ecd495e9
authored
Jul 22, 2024
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
离职继承欢迎语/删除判断是否单向好友
parent
a39c8604
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
WelcomeServiceImpl.java
...aoban/manage/service/service/impl/WelcomeServiceImpl.java
+3
-1
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java
View file @
ecd495e9
...
...
@@ -487,6 +487,7 @@ public class WelcomeServiceImpl implements WelcomeService {
welcomeInfoQO
.
setDefaultWelcomeFlag
(
1
);
List
<
TabWelcome
>
defaultWelcomeList
=
welcomeMapper
.
queryWelcomeList
(
welcomeInfoQO
);
if
(
CollectionUtils
.
isEmpty
(
nonDefaultWelcomList
))
{
logger
.
info
(
"只有默认欢迎语"
);
return
checkAndGetDefaultWelcome
(
defaultWelcomeList
);
}
// 匹配部门组织架构
...
...
@@ -523,7 +524,7 @@ public class WelcomeServiceImpl implements WelcomeService {
if
(
Objects
.
isNull
(
matchWelcome
))
{
return
checkAndGetDefaultWelcome
(
defaultWelcomeList
);
}
logger
.
info
(
"欢迎语已匹配
"
);
logger
.
info
(
"欢迎语已匹配
={}"
,
matchWelcome
.
getWelcomeId
()
);
return
matchWelcome
;
}
...
...
@@ -541,6 +542,7 @@ public class WelcomeServiceImpl implements WelcomeService {
logger
.
info
(
"未配置默认欢迎语"
);
return
null
;
}
logger
.
info
(
"使用默认欢迎语发送"
);
return
convertWelcomeToBo
(
defaultWelcomeList
.
get
(
0
));
}
...
...
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