From 78b0e909aa6ece787091e5d81450c8927ef2599e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 十二月 2023 17:03:12 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
index 60d5bff..ede9405 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeCategoryServiceImpl.java
@@ -1,7 +1,14 @@
 package com.smartor.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.HeCategoryVO;
+import io.jsonwebtoken.lang.Collections;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartor.mapper.HeCategoryMapper;
@@ -10,87 +17,91 @@
 
 /**
  * 瀹ｆ暀鍒嗙被Service涓氬姟灞傚鐞�
- * 
+ *
  * @author smartor
  * @date 2023-03-04
  */
 @Service
-public class HeCategoryServiceImpl implements IHeCategoryService 
-{
+public class HeCategoryServiceImpl implements IHeCategoryService {
     @Autowired
     private HeCategoryMapper heCategoryMapper;
 
     /**
      * 鏌ヨ瀹ｆ暀鍒嗙被
-     * 
+     *
      * @param id 瀹ｆ暀鍒嗙被涓婚敭
      * @return 瀹ｆ暀鍒嗙被
      */
     @Override
-    public HeCategory selectHeCategoryById(Long id)
-    {
+    public HeCategory selectHeCategoryById(Long id) {
         return heCategoryMapper.selectHeCategoryById(id);
     }
 
     /**
      * 鏌ヨ瀹ｆ暀鍒嗙被鍒楄〃
-     * 
+     *
      * @param heCategory 瀹ｆ暀鍒嗙被
      * @return 瀹ｆ暀鍒嗙被
      */
     @Override
-    public List<HeCategory> selectHeCategoryList(HeCategory heCategory)
-    {
-        return heCategoryMapper.selectHeCategoryList(heCategory);
+    public List<HeCategoryVO> selectHeCategoryList(HeCategory heCategory) {
+        List<HeCategory> heCategories = heCategoryMapper.selectHeCategoryList(heCategory);
+        List<HeCategoryVO> heCategoryVOS = DtoConversionUtils.sourceToTarget(heCategories, HeCategoryVO.class);
+        //閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
+        for (HeCategoryVO heCategoryVO : heCategoryVOS) {
+            HeCategory heCategory2 = new HeCategory();
+            heCategory2.setPid(heCategoryVO.getId());
+            List<HeCategory> heCategories1 = heCategoryMapper.selectHeCategoryList(heCategory2);
+            if (!Collections.isEmpty(heCategories1)) {
+                heCategoryVO.setHeCategoryList(heCategories1);
+            }
+        }
+        return heCategoryVOS;
     }
 
     /**
      * 鏂板瀹ｆ暀鍒嗙被
-     * 
+     *
      * @param heCategory 瀹ｆ暀鍒嗙被
      * @return 缁撴灉
      */
     @Override
-    public int insertHeCategory(HeCategory heCategory)
-    {
+    public int insertHeCategory(HeCategory heCategory) {
         heCategory.setCreateTime(DateUtils.getNowDate());
         return heCategoryMapper.insertHeCategory(heCategory);
     }
 
     /**
      * 淇敼瀹ｆ暀鍒嗙被
-     * 
+     *
      * @param heCategory 瀹ｆ暀鍒嗙被
      * @return 缁撴灉
      */
     @Override
-    public int updateHeCategory(HeCategory heCategory)
-    {
+    public int updateHeCategory(HeCategory heCategory) {
         heCategory.setUpdateTime(DateUtils.getNowDate());
         return heCategoryMapper.updateHeCategory(heCategory);
     }
 
     /**
      * 鎵归噺鍒犻櫎瀹ｆ暀鍒嗙被
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑瀹ｆ暀鍒嗙被涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteHeCategoryByIds(Long[] ids)
-    {
+    public int deleteHeCategoryByIds(Long[] ids) {
         return heCategoryMapper.deleteHeCategoryByIds(ids);
     }
 
     /**
      * 鍒犻櫎瀹ｆ暀鍒嗙被淇℃伅
-     * 
+     *
      * @param id 瀹ｆ暀鍒嗙被涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteHeCategoryById(Long id)
-    {
+    public int deleteHeCategoryById(Long id) {
         return heCategoryMapper.deleteHeCategoryById(id);
     }
 }

--
Gitblit v1.9.3