Commit 66490fbb by 墨竹

fix:离职继承bug修改

parent 64aafc3c
...@@ -150,13 +150,13 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -150,13 +150,13 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
dto.setStatusFlag(1); dto.setStatusFlag(1);
dto.setCreateTime(new Date()); dto.setCreateTime(new Date());
dto.setUpdateTime(new Date()); dto.setUpdateTime(new Date());
int insert = mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto)); int insert = mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto));
// setMainStore(dto);
String s = insert > 0 ? dto.getStaffClerkRelationId() : null; String s = insert > 0 ? dto.getStaffClerkRelationId() : null;
if (null != s) { if (null != s) {
String staffId = dto.getStaffId();
clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, dto.getWxEnterpriseId());
//推入日志 //推入日志
staffClerkBindLogService.pushToMq(dto.getStaffId(), optStaffId, BindTypeEnum.BIND.getVal(), chanelCode, dto.getStaffClerkRelationId()); staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), chanelCode, dto.getStaffClerkRelationId());
} }
return s; return s;
} }
...@@ -184,7 +184,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -184,7 +184,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
} }
@Override @Override
public String insert(StaffClerkRelationDTO staffClerkRelation) { public String insert(StaffClerkRelationDTO staffClerkRelation) {
String uuid = StringUtil.randomUUID(); String uuid = StringUtil.randomUUID();
...@@ -228,7 +227,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -228,7 +227,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
} }
@Override @Override
public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId){ public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId)); return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId));
} }
...@@ -259,18 +258,18 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -259,18 +258,18 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
return chatConfig; return chatConfig;
} }
@Override @Override
public List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId) { public List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId) {
return mapper.listByWxEnterpriseId(wxEnterpriseId); return mapper.listByWxEnterpriseId(wxEnterpriseId);
} }
@Override @Override
public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) { public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo); PageHelper.startPage(pageInfo);
List<TabHaobanStaffClerkRelation> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId); List<TabHaobanStaffClerkRelation> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class); Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class);
return retPage; return retPage;
} }
@Override @Override
public List<StaffClerkRelationDTO> listBindByStoreId(String wxEnterpriseId, String storeId) { public List<StaffClerkRelationDTO> listBindByStoreId(String wxEnterpriseId, String storeId) {
......
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