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
8857c513
Commit
8857c513
authored
Feb 26, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
bde3efeb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
StaffApiServiceImpl.java
.../manage/service/service/out/impl/StaffApiServiceImpl.java
+13
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
View file @
8857c513
...
@@ -21,6 +21,8 @@ import com.gic.api.base.commons.Page;
...
@@ -21,6 +21,8 @@ import com.gic.api.base.commons.Page;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.common.utils.PageUtil
;
import
com.gic.haoban.common.utils.PageUtil
;
...
@@ -70,6 +72,8 @@ public class StaffApiServiceImpl implements StaffApiService {
...
@@ -70,6 +72,8 @@ public class StaffApiServiceImpl implements StaffApiService {
private
ClerkService
clerkService
;
private
ClerkService
clerkService
;
@Autowired
@Autowired
private
com
.
gic
.
enterprise
.
api
.
service
.
DepartmentService
gicDepartmentService
;
private
com
.
gic
.
enterprise
.
api
.
service
.
DepartmentService
gicDepartmentService
;
@Autowired
private
StoreService
storeService
;
@Override
@Override
public
StaffDTO
selectById
(
String
staffId
)
{
public
StaffDTO
selectById
(
String
staffId
)
{
...
@@ -312,8 +316,15 @@ public class StaffApiServiceImpl implements StaffApiService {
...
@@ -312,8 +316,15 @@ public class StaffApiServiceImpl implements StaffApiService {
if
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNoneBlank
(
related
.
getClerkCode
())){
if
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNoneBlank
(
related
.
getClerkCode
())){
if
(!
staffDTO
.
getPhoneNumber
().
equals
(
related
.
getPhoneNumber
())||!
staffDTO
.
getStaffName
().
equals
(
oldStaff
.
getStaffName
())){
if
(!
staffDTO
.
getPhoneNumber
().
equals
(
related
.
getPhoneNumber
())||!
staffDTO
.
getStaffName
().
equals
(
oldStaff
.
getStaffName
())){
TabHaobanDepartment
department
=
departmentService
.
selectById
(
addId
);
TabHaobanDepartment
department
=
departmentService
.
selectById
(
addId
);
com
.
gic
.
enterprise
.
api
.
dto
.
DepartmentDTO
dto
=
gicDepartmentService
.
getDeptment
(
department
.
getRelatedId
());
String
enterpriseId
=
""
;
ClerkDTO
clerkDTO
=
clerkService
.
getClerkByCodeNoStatus
(
dto
.
getEnterpriseId
(),
related
.
getClerkCode
());
if
(
department
.
getIsStore
()
==
0
){
com
.
gic
.
enterprise
.
api
.
dto
.
DepartmentDTO
dto
=
gicDepartmentService
.
getDeptment
(
department
.
getRelatedId
());
enterpriseId
=
dto
.
getEnterpriseId
();
}
else
{
StoreDTO
store
=
storeService
.
getStore
(
department
.
getRelatedId
());
enterpriseId
=
store
.
getEnterpriseId
();
}
ClerkDTO
clerkDTO
=
clerkService
.
getClerkByCodeNoStatus
(
enterpriseId
,
related
.
getClerkCode
());
logger
.
info
(
"【员工修改】clerkDTO={}"
,
JSON
.
toJSONString
(
clerkDTO
));
logger
.
info
(
"【员工修改】clerkDTO={}"
,
JSON
.
toJSONString
(
clerkDTO
));
clerkDTO
.
setClerkName
(
staffDTO
.
getStaffName
());
clerkDTO
.
setClerkName
(
staffDTO
.
getStaffName
());
clerkDTO
.
setPhoneNumber
(
staffDTO
.
getPhoneNumber
());
clerkDTO
.
setPhoneNumber
(
staffDTO
.
getPhoneNumber
());
...
...
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