Merge remote-tracking branch 'origin/main' into main

src/main/java/cn/com/tenlion/service/columnmng/impl/ColumnMngServiceImpl.java

@@ -123,7 +123,7 @@ public class ColumnMngServiceImpl extends DefaultBaseService implements IColumnM
         List<ColumnMngDTO> list = columnMngDao.list(params);
         for (ColumnMngDTO item : list){
             String[] resourceTypeList = item.getResourceType().split(",");
-            if(resourceTypeList != null || !"".equals(resourceTypeList[0])){
+            if(resourceTypeList != null && !"".equals(resourceTypeList[0])){
                 String resourceTypeName = "";
                 for(int i = 0; i < resourceTypeList.length; i++){
                     resourceTypeName += MaterialTypeEnum.valueOf(resourceTypeList[i]).getTypeName() + ",";

src/main/java/cn/com/tenlion/service/usercolumn/impl/UserColumnServiceImpl.java

@@ -53,6 +53,7 @@ public class UserColumnServiceImpl extends DefaultBaseService implements IUserCo
         Map<String, Object> params = new HashMap<>();
         params.put("creator",creator);
         return this.list(params);
+
     }
 
 

src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java

@@ -37,10 +37,30 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs
     private IUserColumnDataDao userColumnDataDao;
     @Autowired
     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
     public void save(UserColumnDataVO userColumnDataVO) {
@@ -165,6 +185,10 @@ public class UserColumnDataServiceImpl extends DefaultBaseService implements IUs
 
     @Override
     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);
         for (UserColumnDataDTO userColumnDataDTO : list) {
             MaterialDataDTO materialDataDTO = materialDataService.getByMaterialId(userColumnDataDTO.getUserColumnDataId());

src/main/resources/static/route/columnmng/update.html

@@ -157,6 +157,7 @@
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
         var columnId = top.restAjax.params(window.location.href).columnId;
+        var viewerObj = {};
 
         // 初始化内容
         function initData() {