From 0758f0d738380f782f0c9d3989eb81c25b56380b Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Fri, 23 Feb 2024 14:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A1=B9=E7=9B=AE=E9=87=8D=E5=A4=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DictionaryController.java                 | 19 +++++++++++++++-
 .../DictionaryMapper.java                     |  2 ++
 .../DictionaryService.java                    |  6 +++++
 .../impl/DictionaryServiceImpl.java           |  5 +++++
 .../DictionaryMapper.xml                      | 22 +++++++++++++++++--
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java
index ada4a64..a33366b 100644
--- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java
+++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java
@@ -181,7 +181,6 @@ public class DictionaryController extends BaseController {
     /**
      * 列表
      *
-     * @param page
      * @throws Exception
      */
     @RequestMapping(value = "/listSelect")
@@ -196,4 +195,22 @@ public class DictionaryController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
+    /**
+     * 列表
+     *
+     * @throws Exception
+     */
+    @RequestMapping(value = "/validateExist")
+    @ResponseBody
+    public Object validateExist() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        Integer count = dictionaryService.validateExist(pd);    //列出Dictionary列表
+        map.put("count", count);
+        map.put("result", errInfo);
+        return map;
+    }
 }
diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java
index 4a4fee4..769b115 100644
--- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java
+++ b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java
@@ -62,5 +62,7 @@ public interface DictionaryMapper {
 	 * @throws Exception
 	 */
 	List<PageData> listSelect(PageData pd);
+
+	Integer validateExist(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java
index 0fba90f..bb36588 100644
--- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java
+++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java
@@ -72,5 +72,11 @@ public interface DictionaryService {
 	 * @throws Exception
 	 */
 	List<PageData> listSelect(PageData pd)throws Exception;
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	Integer validateExist(PageData pd)throws Exception;
 }
 
diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java
index 969a108..8c874d6 100644
--- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java
+++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java
@@ -150,5 +150,10 @@ public class DictionaryServiceImpl implements DictionaryService {
     public List<PageData> listSelect(PageData pd)throws Exception{
         return dictionaryMapper.listSelect(pd);
     }
+
+    @Override
+    public Integer validateExist(PageData pd) throws Exception {
+        return dictionaryMapper.validateExist(pd);
+    }
 }
 
diff --git a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml
index 000c23c..ae2e88e 100644
--- a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml
+++ b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml
@@ -237,9 +237,9 @@
 		COUNT(*)
 		FROM
 		<include refid="tableName"></include> f
-		WHERE
+		WHERE 1=1
 		<if test="DICTIONARY_LEVEL != null">
-			DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}
+			and DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}
 		</if>
 	</select>
 
@@ -270,4 +270,22 @@
 		order by f.DICTIONARY_SORT asc
 	</select>
 
+	<!--	* 获取符合条件数，+1后作为排序使用-->
+	<select id="validateExist" parameterType="pd" resultType="Integer" >
+		SELECT
+		COUNT(*)
+		FROM
+		<include refid="tableName"></include> f
+		WHERE f.ISDELETE = '0'
+		<if test="DICTIONARY_LEVEL != null">
+			and f.DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}
+		</if>
+		<if test="DICTIONARY_NAME != null and DICTIONARY_NAME != ''">
+			and f.DICTIONARY_NAME = #{DICTIONARY_NAME}
+		</if>
+		<if test="PARENT_ID != null and PARENT_ID != ''">
+			and f.PARENT_ID = #{PARENT_ID}
+		</if>
+	</select>
+
 </mapper>