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
27fa84d1
Commit
27fa84d1
authored
Feb 28, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
db134cb0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
4 deletions
+35
-4
WxApplicationApiService.java
...ic/haoban/manage/api/service/WxApplicationApiService.java
+8
-0
WxApplicationApiServiceImpl.java
...service/service/out/impl/WxApplicationApiServiceImpl.java
+5
-0
StaffController.java
...com/gic/haoban/manage/web/controller/StaffController.java
+22
-4
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxApplicationApiService.java
View file @
27fa84d1
...
@@ -18,4 +18,12 @@ public interface WxApplicationApiService {
...
@@ -18,4 +18,12 @@ public interface WxApplicationApiService {
* @param suiteId
* @param suiteId
*/
*/
void
cancelSuite
(
String
corpId
,
String
suiteId
);
void
cancelSuite
(
String
corpId
,
String
suiteId
);
/**
*
* @param wxEnterpriseId
* @param type
* @return
*/
WxApplicationDTO
selectByWxEnterpriseIdAndApplicationType
(
String
wxEnterpriseId
,
int
type
);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxApplicationApiServiceImpl.java
View file @
27fa84d1
...
@@ -39,4 +39,9 @@ public class WxApplicationApiServiceImpl implements WxApplicationApiService{
...
@@ -39,4 +39,9 @@ public class WxApplicationApiServiceImpl implements WxApplicationApiService{
}
}
log
.
info
(
"企业未绑定过,{}"
,
corpId
);
log
.
info
(
"企业未绑定过,{}"
,
corpId
);
}
}
@Override
public
WxApplicationDTO
selectByWxEnterpriseIdAndApplicationType
(
String
wxEnterpriseId
,
int
type
)
{
return
EntityUtil
.
changeEntityByJSON
(
WxApplicationDTO
.
class
,
wxApplicationService
.
selectByWxEnterpriseIdAndApplicationType
(
wxEnterpriseId
,
type
));
}
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
View file @
27fa84d1
...
@@ -18,13 +18,18 @@ import com.gic.haoban.common.utils.HaobanResponse;
...
@@ -18,13 +18,18 @@ import com.gic.haoban.common.utils.HaobanResponse;
import
com.gic.haoban.manage.api.dto.DepartmentDTO
;
import
com.gic.haoban.manage.api.dto.DepartmentDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.WxApplicationDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseDTO
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.api.service.WxApplicationApiService
;
import
com.gic.haoban.manage.api.service.WxEnterpriseApiService
;
import
com.gic.haoban.manage.web.auth.AuthRequestUtil
;
import
com.gic.haoban.manage.web.auth.AuthRequestUtil
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.qo.StaffEditJsonQO
;
import
com.gic.haoban.manage.web.qo.StaffEditJsonQO
;
import
com.gic.haoban.manage.web.vo.LoginVO
;
import
com.gic.haoban.manage.web.vo.LoginVO
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
@RestController
@RestController
...
@@ -37,6 +42,12 @@ public class StaffController extends WebBaseController{
...
@@ -37,6 +42,12 @@ public class StaffController extends WebBaseController{
private
DepartmentApiService
departmentApiService
;
private
DepartmentApiService
departmentApiService
;
@Autowired
@Autowired
private
StaffDepartmentRelatedApiService
staffDepartmentRelatedApiService
;
private
StaffDepartmentRelatedApiService
staffDepartmentRelatedApiService
;
@Autowired
private
QywxUserApiService
qywxUserApiService
;
@Autowired
private
WxEnterpriseApiService
wxEnterpriseApiService
;
@Autowired
private
WxApplicationApiService
wxApplicationApiService
;
@RequestMapping
(
"staff-add"
)
@RequestMapping
(
"staff-add"
)
public
HaobanResponse
staffAdd
(
StaffDTO
staffDTO
,
String
departmentIds
){
public
HaobanResponse
staffAdd
(
StaffDTO
staffDTO
,
String
departmentIds
){
...
@@ -132,15 +143,22 @@ public class StaffController extends WebBaseController{
...
@@ -132,15 +143,22 @@ public class StaffController extends WebBaseController{
@RequestMapping
(
"staff-invite"
)
@RequestMapping
(
"staff-invite"
)
public
HaobanResponse
staffInvite
(
String
staffIds
){
public
HaobanResponse
staffInvite
(
String
staffIds
){
String
[]
staffArr
=
staffIds
.
split
(
","
);
String
[]
staffArr
=
staffIds
.
split
(
","
);
String
[]
userArr
=
new
String
[
staffArr
.
length
]
;
List
<
String
>
userArr
=
new
ArrayList
<>()
;
int
index
=
0
;
String
wxEnterpriseId
=
""
;
for
(
String
staffId
:
staffArr
)
{
for
(
String
staffId
:
staffArr
)
{
StaffDTO
staff
=
staffApiService
.
selectById
(
staffId
);
StaffDTO
staff
=
staffApiService
.
selectById
(
staffId
);
if
(
staff
!=
null
){
if
(
staff
!=
null
){
String
userId
=
staff
.
getWxUserId
();
String
userId
=
staff
.
getWxUserId
();
userArr
[
index
]
=
userId
;
wxEnterpriseId
=
staff
.
getWxEnterpriseId
();
userArr
.
add
(
userId
);
}
}
WxEnterpriseDTO
enterpriseDTO
=
wxEnterpriseApiService
.
getOne
(
wxEnterpriseId
);
WxApplicationDTO
application
=
wxApplicationApiService
.
selectByWxEnterpriseIdAndApplicationType
(
wxEnterpriseId
,
1
);
if
(
enterpriseDTO
!=
null
)
{
if
(
application
!=
null
)
{
qywxUserApiService
.
inviteUser
(
enterpriseDTO
.
getCorpid
(),
application
.
getSiteId
(),
userArr
);
}
}
index
++;
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
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