Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceCategoryMapper.java

@@ -21,4 +21,6 @@ public interface HceCategoryMapper extends CrudMapper<HceCategory> {
     List<HceCategoryListVO> selectMenuTreeByUserId(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
 
     List<HceCategoryListVO> selectMenuTreeByUserIdOne(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("tenantId") Integer tenantId);
+
+    List<HceCategory> getMenuNameList(@Param("categoryIdList") List<Integer> categoryIdList);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceArticleServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.web.util.HtmlUtils;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,9 +48,20 @@ public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper,
                 .orderByDesc(HceArticle::getIstop).orderByAsc(HceArticle::getSortindex, HceArticle::getId);
         page = this.page(page,queryWrapper);
         if(page.getRecords().size() > 0){
-            LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.eq(HceCategory::getStatus,1);
-            List<HceCategory> list = hceCategoryMapper.selectList(queryWrapper1);
+
+            List<Integer> categoryIdList = new ArrayList<>();
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                Integer categoryId = page.getRecords().get(i).getCategoryid();
+                if(!categoryIdList.contains(categoryId)){
+                    categoryIdList.add(categoryId);
+                }
+            }
+
+            List<HceCategory> list = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(categoryIdList)){
+                list = hceCategoryMapper.getMenuNameList(categoryIdList);
+            }
+
             if(CollectionUtils.isNotEmpty(list)){
                 for(int i=0;i<page.getRecords().size();i++){
 //                    page.getRecords().get(i).setContent(HtmlUtils.htmlUnescape(page.getRecords().get(i).getContent()));

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceCategoryMapper.xml

@@ -111,5 +111,29 @@
         </if>
         ORDER BY m.parent_id, m.order_num
     </select>
+    <select id="getMenuNameList" resultType="com.usky.system.domain.HceCategory">
+        SELECT
+            distinct m.menu_id as menuId,
+                    m.menu_name as menuName,
+                    m.parent_id as parentId,
+                    m.order_num as orderNum,
+                    m.is_frame as isFrame,
+                    m.is_cache as isCache,
+                    h.id as id,
+                    h.imagePath as imagePath,
+                    h.createdate as createdate,
+                    h.modifydate as modifydate,
+                    h.status as status
+        FROM
+            sys_menu m
+                inner join hce_category h on m.menu_id = h.menu_id
+        WHERE m.menu_type IN ('M', 'C')
+          and m.visible = 0
+          and m.status = 0
+          and h.id in 
+          <foreach collection="categoryIdList" item="categoryId" index="index" open="(" close=")" separator=",">
+              #{categoryId}
+          </foreach>
+    </select>
 
 </mapper>