From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-dev/src/main/java/com/java110/dev/cmd/dict/ListDictCmd.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/service-dev/src/main/java/com/java110/dev/cmd/dict/ListDictCmd.java b/service-dev/src/main/java/com/java110/dev/cmd/dict/ListDictCmd.java
index 799c07f..7996eef 100644
--- a/service-dev/src/main/java/com/java110/dev/cmd/dict/ListDictCmd.java
+++ b/service-dev/src/main/java/com/java110/dev/cmd/dict/ListDictCmd.java
@@ -17,16 +17,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.Dict.DictDto;
+import com.java110.dto.dict.DictDto;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
-import com.java110.po.dict.DictPo;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,12 +61,12 @@
DictDto dictDto = BeanConvertUtil.covertBean(reqJson, DictDto.class);
- int count = dictV1InnerServiceSMOImpl.queryDictsCount(dictDto);
+ int count = dictV1InnerServiceSMOImpl.queryDictsAndSpecCount(dictDto);
List<DictDto> dictDtos = null;
if (count > 0) {
- dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
+ dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
} else {
dictDtos = new ArrayList<>();
}
--
Gitblit v1.8.0