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
07c393de
Commit
07c393de
authored
Jun 05, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
b987c597
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
AuditApiServiceImpl.java
.../manage/service/service/out/impl/AuditApiServiceImpl.java
+7
-3
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+0
-1
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
View file @
07c393de
...
...
@@ -102,6 +102,10 @@ public class AuditApiServiceImpl implements AuditApiService{
List
<
String
>
staffIds
=
new
ArrayList
<>();
List
<
String
>
storeIds
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotEmpty
(
search
)){
// List<StoreDTO> list = storeService.searchStoreByCodeOrName(enterpriseId,search);
List
<
TabHaobanDepartment
>
departmentList
=
departmentMapper
.
listDepartmentLikeName
(
search
);
if
(
CollectionUtil
.
isNotEmpty
(
departmentList
)){
departmentIds
=
departmentList
.
stream
().
map
(
s
->
s
.
getDepartmentId
()).
collect
(
Collectors
.
toList
());
...
...
@@ -358,9 +362,9 @@ public class AuditApiServiceImpl implements AuditApiService{
}
else
if
(
StoreFieldEnum
.
STORE_NAME
.
getValue
().
equals
(
changeField
)){
//门店名字
store
.
setStoreName
(
newValue
);
TabHaobanDepartment
tab
=
departmentMapper
.
getByRelatedId
(
store
.
getStoreId
());
tab
.
setDepartmentName
(
newValue
);
departmentMapper
.
updateByPrimaryKey
(
tab
);
//
TabHaobanDepartment tab = departmentMapper.getByRelatedId(store.getStoreId());
//
tab.setDepartmentName(newValue);
//
departmentMapper.updateByPrimaryKey(tab);
}
else
if
(
StoreFieldEnum
.
STORE_IMAG
.
getValue
().
equals
(
changeField
)){
//门店图片
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
07c393de
...
...
@@ -450,7 +450,6 @@ public class ClerkController extends WebBaseController{
if
(
staffClerkRelation
==
null
){
staffClerkRelation
=
new
StaffClerkRelationDTO
();
}
staffClerkRelation
=
new
StaffClerkRelationDTO
();
staffClerkRelation
.
setClerkId
(
clerkId
);
staffClerkRelation
.
setClerkCode
(
clerkCode
);
staffClerkRelation
.
setStoreId
(
clerk
.
getStoreId
());
...
...
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