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
dd9fcfdd
Commit
dd9fcfdd
authored
Apr 03, 2020
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
emojo表情错误以及加入刷新接口
parent
4e0caab3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
5 deletions
+25
-5
pom.xml
haoban-manage3-service/pom.xml
+7
-2
StaffApiServiceImpl.java
.../manage/service/service/out/impl/StaffApiServiceImpl.java
+10
-3
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+8
-0
No files found.
haoban-manage3-service/pom.xml
View file @
dd9fcfdd
...
...
@@ -55,8 +55,13 @@
<version>
${haoban-config}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-manage3-api
</artifactId>
<groupId>
com.vdurmont
</groupId>
<artifactId>
emoji-java
</artifactId>
<version>
4.0.0
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-manage3-api
</artifactId>
<version>
${haoban-manage3-api}
</version>
</dependency>
<dependency>
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
View file @
dd9fcfdd
...
...
@@ -12,6 +12,8 @@ import java.util.stream.Collectors;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.service.util.EmojiFilterUtil
;
import
com.vdurmont.emoji.EmojiParser
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.hibernate.hql.internal.CollectionSubqueryFactory
;
...
...
@@ -311,9 +313,14 @@ public class StaffApiServiceImpl implements StaffApiService {
tab
.
setStatusFlag
(
1
);
tab
.
setWxEnterpriseId
(
wxEnterpriseId
);
tab
.
setPhoneNumber
(
user
.
getMobile
());
tab
.
setStaffName
(
user
.
getName
());
tab
.
setNickName
(
user
.
getAlias
());
tab
.
setNationCode
(
"86"
);
if
(
StringUtils
.
isNotBlank
(
user
.
getName
()))
{
tab
.
setStaffName
(
EmojiParser
.
removeAllEmojis
(
user
.
getName
()));
}
if
(
StringUtils
.
isNotBlank
(
user
.
getAlias
()))
{
tab
.
setNickName
(
EmojiParser
.
removeAllEmojis
(
user
.
getAlias
()));
}
// tab.setNickName(user.getAlias());
tab
.
setNationCode
(
"86"
);
tab
.
setSex
(
user
.
getGender
()
==
null
?
1
:
Integer
.
parseInt
(
user
.
getGender
()));
tab
.
setActiveFlag
(
1
);
tab
.
setPostion
(
user
.
getPosition
());
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
dd9fcfdd
...
...
@@ -784,6 +784,14 @@ public class DepartmentContoller extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
@RequestMapping
(
"department-user-init"
)
public
HaobanResponse
departmentInit
(
String
corpid
,
String
suiteid
,
String
wxEnterpriseId
,
Integer
wxDepartmentId
)
{
RedisUtil
.
delCache
(
"haoban-user-department-"
+
wxEnterpriseId
);
staffApiService
.
initWxUser
(
corpid
,
suiteid
,
wxEnterpriseId
,
wxDepartmentId
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
}
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