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
c2e28866
Commit
c2e28866
authored
Apr 21, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6a28c164
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+1
-1
SyncDealContoller.java
...m/gic/haoban/manage/web/controller/SyncDealContoller.java
+6
-6
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
c2e28866
...
...
@@ -125,7 +125,7 @@ public class DepartmentContoller extends WebBaseController{
@RequestMapping
(
"department-list-level"
)
public
HaobanResponse
departmentLevelList
(
String
parentId
)
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
logger
.
info
(
"【部门层级列表】wxEnterpriseId={}"
,
wxEnterpriseId
);
List
<
DepartmentDTO
>
list
=
new
ArrayList
<
DepartmentDTO
>();
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java
View file @
c2e28866
...
...
@@ -39,7 +39,7 @@ public class SyncDealContoller extends WebBaseController {
task
=
dealSyncOperationApiService
.
createTask
(
wxEid
,
"门店同步"
,
"11111"
,
"部门同步"
);
dealSyncOperationApiService
.
dealDepartment
(
task
,
wxEid
,
qo
.
getAddDepartment
(),
qo
.
getEditDepartment
());
}
else
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
String
key
=
"haoban-sync-department-"
+
wxEnterpriseId
;
if
(
RedisUtil
.
getCache
(
key
)
!=
null
)
{
...
...
@@ -58,7 +58,7 @@ public class SyncDealContoller extends WebBaseController {
public
HaobanResponse
departmentBatchSync
(
@RequestBody
SyncDealQO
qo
)
{
String
task
=
null
;
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
logger
.
info
(
"login:{}"
,
JSONObject
.
toJSONString
(
login
));
...
...
@@ -86,7 +86,7 @@ public class SyncDealContoller extends WebBaseController {
@RequestMapping
(
"department-sync-check"
)
public
HaobanResponse
syncSuccess
(
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isBlank
(
wxEnterpriseId
))
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
}
SyncCheckDTO
taskCheck
=
dealSyncOperationApiService
.
getTaskCheck
(
wxEnterpriseId
);
...
...
@@ -102,7 +102,7 @@ public class SyncDealContoller extends WebBaseController {
@RequestMapping
(
"/test/department-sync-check"
)
public
HaobanResponse
testSyncSuccess
(
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isBlank
(
wxEnterpriseId
))
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
}
SyncCheckDTO
taskCheck
=
dealSyncOperationApiService
.
getTaskCheck
(
wxEnterpriseId
);
...
...
@@ -113,7 +113,7 @@ public class SyncDealContoller extends WebBaseController {
@ResponseBody
public
HaobanResponse
clerkReSync
(
String
taskId
)
{
if
(
StringUtils
.
isBlank
(
taskId
))
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
taskId
=
dealSyncOperationApiService
.
getTaskLock
(
wxEnterpriseId
);
}
...
...
@@ -126,7 +126,7 @@ public class SyncDealContoller extends WebBaseController {
@ResponseBody
public
HaobanResponse
closeReSync
(
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isBlank
(
wxEnterpriseId
))
{
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Sessio
nUser
();
LoginVO
login
=
(
LoginVO
)
AuthRequestUtil
.
get
Logi
nUser
();
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
}
dealSyncOperationApiService
.
closeTask
(
wxEnterpriseId
);
...
...
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