From 3eb14d2d4c0dad58dbc992fe785f4c8cfd3c4454 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Mon, 31 May 2021 17:38:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eapp=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usercolumndata/impl/UserColumnDataServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java b/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java index e3ebfec..0b5b805 100644 --- a/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java @@ -52,8 +52,10 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs private MaterialDataService materialDataService; - - + @Override + public List listMyCreator(String creator) { + return null; + } @Override public void save(UserColumnDataVO userColumnDataVO) { From 5aeb6d6e75362b5493841f465741edb2262e0f8b Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Mon, 31 May 2021 17:43:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eapp=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/UserColumnDataServiceImpl.java | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java b/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java index 0b5b805..d2fc592 100644 --- a/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java @@ -50,11 +50,29 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs private IUserColumnDataDao userColumnDataDao; @Autowired private MaterialDataService materialDataService; + @Autowired + private IUserColumnService userColumnService; - @Override - public List listMyCreator(String creator) { - return null; + + public List listMyCreator(String creator){ + List list = new ArrayList(); + List userColumnDTOS = userColumnService.listByCreatorTitle(creator); + ListPage page = new ListPage(); + page.setRows(3); + page.setPage(1); + for (UserColumnDTO userColumnDTO : userColumnDTOS) { + Map params = new HashMap<>(); + params.put("columnId",userColumnDTO.getColumnId()); + page.setParams(params); + SuccessResultList> listSuccessResultList = this.listPage(page); + UserColumnDataListDTO dto = new UserColumnDataListDTO(); + dto.setData(listSuccessResultList.getRows()); + dto.setColumnName(userColumnDTO.getColumnName()); + dto.setColumnId(userColumnDTO.getColumnId()); + + } + return list; } @Override @@ -180,6 +198,10 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs @Override public List list(Map params) { + String columnId = params.get("columnId").toString(); + if(StringUtils.isBlank(columnId)){ + return new ArrayList<>(); + } List list = userColumnDataDao.list(params); for (UserColumnDataDTO userColumnDataDTO : list) { MaterialDataDTO materialDataDTO = materialDataService.getByMaterialId(userColumnDataDTO.getUserColumnDataId());