Browse Source

修改字典查询

silent 4 năm trước cách đây
mục cha
commit
a7077c7d4d

+ 1 - 1
ldt-core/src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -135,7 +135,7 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 				.ne(DictBiz::getId, parentId)
 				.eq(DictBiz::getCode, parentDict.getCode())
 				.orderByAsc(DictBiz::getSort));
-		return DictBizWrapper.build().pageVO(page);
+		return DictBizWrapper.build().pageNodeVO(page);
 	}
 
 	@Transactional

+ 10 - 2
ldt-core/src/main/java/org/springblade/modules/system/wrapper/DictBizWrapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.system.wrapper;
 
-import net.sf.jsqlparser.statement.merge.Merge;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -59,7 +59,7 @@ public class DictBizWrapper extends BaseEntityWrapper<DictBiz, DictBizVO> {
 		List<DictBizVO> result = ForestNodeMerger.merge(collect);
 		result.stream().forEach(
 			dictBizVO -> {
-				if(dictBizVO.getChildren() != null&&dictBizVO.getChildren().size()>0){
+				if (dictBizVO.getChildren() != null && dictBizVO.getChildren().size() > 0) {
 					dictBizVO.setHasChildren(true);
 				}
 			}
@@ -67,4 +67,12 @@ public class DictBizWrapper extends BaseEntityWrapper<DictBiz, DictBizVO> {
 		return result;
 	}
 
+	public IPage<DictBizVO> pageNodeVO(IPage<DictBiz> pages) {
+		IPage<DictBizVO> dictBizVOIPage = super.pageVO(pages);
+		dictBizVOIPage.getRecords().forEach(ele -> {
+			ele.setHasChildren(true);
+		});
+		return dictBizVOIPage;
+	}
+
 }