Commit 27fa84d1 by qwmqiuwenmin

fix

parent db134cb0
......@@ -18,4 +18,12 @@ public interface WxApplicationApiService {
* @param suiteId
*/
void cancelSuite(String corpId, String suiteId);
/**
*
* @param wxEnterpriseId
* @param type
* @return
*/
WxApplicationDTO selectByWxEnterpriseIdAndApplicationType(String wxEnterpriseId, int type);
}
......@@ -39,4 +39,9 @@ public class WxApplicationApiServiceImpl implements WxApplicationApiService{
}
log.info("企业未绑定过,{}", corpId);
}
@Override
public WxApplicationDTO selectByWxEnterpriseIdAndApplicationType(String wxEnterpriseId, int type) {
return EntityUtil.changeEntityByJSON(WxApplicationDTO.class, wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, type));
}
}
......@@ -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.StaffDTO;
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.StaffApiService;
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.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
import com.gic.haoban.manage.web.vo.LoginVO;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
@RestController
......@@ -37,6 +42,12 @@ public class StaffController extends WebBaseController{
private DepartmentApiService departmentApiService;
@Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Autowired
private QywxUserApiService qywxUserApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private WxApplicationApiService wxApplicationApiService;
@RequestMapping("staff-add")
public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){
......@@ -132,15 +143,22 @@ public class StaffController extends WebBaseController{
@RequestMapping("staff-invite")
public HaobanResponse staffInvite(String staffIds){
String[] staffArr = staffIds.split(",");
String[] userArr = new String[staffArr.length];
int index = 0;
List<String> userArr = new ArrayList<>();
String wxEnterpriseId = "";
for (String staffId : staffArr) {
StaffDTO staff = staffApiService.selectById(staffId);
if(staff != null){
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment