Merge branch 'main' of e.coding.net:tsteam/business-card/business-card into main
This commit is contained in:
commit
1863a664c1
@ -50,10 +50,30 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs
|
|||||||
private IUserColumnDataDao userColumnDataDao;
|
private IUserColumnDataDao userColumnDataDao;
|
||||||
@Autowired
|
@Autowired
|
||||||
private MaterialDataService materialDataService;
|
private MaterialDataService materialDataService;
|
||||||
|
@Autowired
|
||||||
|
private IUserColumnService userColumnService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public List<UserColumnDataListDTO> listMyCreator(String creator){
|
||||||
|
List<UserColumnDataListDTO> list = new ArrayList<UserColumnDataListDTO>();
|
||||||
|
List<UserColumnDTO> userColumnDTOS = userColumnService.listByCreatorTitle(creator);
|
||||||
|
ListPage page = new ListPage();
|
||||||
|
page.setRows(3);
|
||||||
|
page.setPage(1);
|
||||||
|
for (UserColumnDTO userColumnDTO : userColumnDTOS) {
|
||||||
|
Map<String, Object> params = new HashMap<>();
|
||||||
|
params.put("columnId",userColumnDTO.getColumnId());
|
||||||
|
page.setParams(params);
|
||||||
|
SuccessResultList<List<UserColumnDataDTO>> listSuccessResultList = this.listPage(page);
|
||||||
|
UserColumnDataListDTO dto = new UserColumnDataListDTO();
|
||||||
|
dto.setData(listSuccessResultList.getRows());
|
||||||
|
dto.setColumnName(userColumnDTO.getColumnName());
|
||||||
|
dto.setColumnId(userColumnDTO.getColumnId());
|
||||||
|
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save(UserColumnDataVO userColumnDataVO) {
|
public void save(UserColumnDataVO userColumnDataVO) {
|
||||||
@ -178,6 +198,10 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<UserColumnDataDTO> list(Map<String, Object> params) {
|
public List<UserColumnDataDTO> list(Map<String, Object> params) {
|
||||||
|
String columnId = params.get("columnId").toString();
|
||||||
|
if(StringUtils.isBlank(columnId)){
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
List<UserColumnDataDTO> list = userColumnDataDao.list(params);
|
List<UserColumnDataDTO> list = userColumnDataDao.list(params);
|
||||||
for (UserColumnDataDTO userColumnDataDTO : list) {
|
for (UserColumnDataDTO userColumnDataDTO : list) {
|
||||||
MaterialDataDTO materialDataDTO = materialDataService.getByMaterialId(userColumnDataDTO.getUserColumnDataId());
|
MaterialDataDTO materialDataDTO = materialDataService.getByMaterialId(userColumnDataDTO.getUserColumnDataId());
|
||||||
|
Loading…
Reference in New Issue
Block a user