Commit 0d07878e by 徐高华

删除无效代码

parent ce897228
...@@ -472,17 +472,6 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -472,17 +472,6 @@ public class StaffApiServiceImpl implements StaffApiService {
return staffDTO; return staffDTO;
} }
// @Override
// public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId) {
// TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedService.getDepartmentIdAndStaffId(departmentId, staffId);
// return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, tab);
// }
// @Override
// public StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code) {
// return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, staffDepartmentRelatedMapper.getDepartmentIdAndCode(departmentId, code));
// }
@Override @Override
public void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId) { public void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId) {
List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, contactSecret, wxDepartmentId.toString(), 0); List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, contactSecret, wxDepartmentId.toString(), 0);
...@@ -666,47 +655,6 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -666,47 +655,6 @@ public class StaffApiServiceImpl implements StaffApiService {
return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(tabHaobanStaffs), StaffDTO.class); return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(tabHaobanStaffs), StaffDTO.class);
} }
// @Override
// public List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId) {
// List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxEnterpriseId(wxEnterpriseId);
// return EntityUtil.changeEntityListNew(StaffDTO.class, tabHaobanStaffs);
// }
// @Override
// public List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId) {
// List<StaffDTO> list = staffService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
// if (CollectionUtils.isEmpty(list)) {
// return Collections.EMPTY_LIST;
// }
// this.addDepartInfo(list);
// return list;
// }
private void addDepartInfo(List<StaffDTO> list) {
List<String> staffIdList = list.stream().map(dto -> dto.getStaffId()).collect(Collectors.toList());
List<TabHaobanStaffDepartmentRelated> deplist = staffDepartmentRelatedMapper.listStaffDepartmentByStaffIds(staffIdList);
if (CollectionUtil.isNotEmpty(list)) {
Map<String, List<TabHaobanStaffDepartmentRelated>> map = deplist.stream().collect(Collectors.groupingBy(TabHaobanStaffDepartmentRelated::getStaffId));
List<String> depIdList = deplist.stream().map(dto -> dto.getDepartmentId()).collect(Collectors.toList());
List<DepartmentDTO> departmentList = this.departmentService.listByIds(depIdList);
Map<String, DepartmentDTO> depMap = departmentList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, dto -> dto, (k1, k2) -> k1));
for (StaffDTO dto : list) {
String staffId = dto.getStaffId();
List<TabHaobanStaffDepartmentRelated> relateList = map.get(staffId);
if (CollectionUtils.isNotEmpty(relateList)) {
List<DepartmentDTO> staffDepList = new ArrayList<>();
for (TabHaobanStaffDepartmentRelated item : relateList) {
if (null != depMap.get(item.getDepartmentId())) {
staffDepList.add(depMap.get(item.getDepartmentId()));
}
}
dto.setDepartmentList(staffDepList);
}
}
}
}
@Override @Override
public int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId) { public int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId) {
return staffService.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId); return staffService.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId);
...@@ -773,20 +721,6 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -773,20 +721,6 @@ public class StaffApiServiceImpl implements StaffApiService {
if (StringUtils.isNotBlank(qrCode)) { if (StringUtils.isNotBlank(qrCode)) {
return staffQrCodeDTO; return staffQrCodeDTO;
} }
//获取微信信息
String wxUserId = staff.getWxUserId();
if (qwDTO.needOpenUserIdDk()) {
wxUserId = staff.getWxOpenUseId();
}
UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
if (null == user) {
logger.info("企业微信用户不存在:wxEnterpriseId:{}:wxUserId:{}", wxEnterpriseId, wxUserId);
return staffQrCodeDTO;
}
String qr_code = user.getQr_code();
staffMapper.updateQrCodeByStaffId(staffId, qr_code);
staffQrCodeDTO.setQrCode(qr_code);
return staffQrCodeDTO; return staffQrCodeDTO;
} }
......
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