From e5a8a04f88df49d2ce763f2a49115c4f54283aaa Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Fri, 22 Jan 2021 15:26:25 +0800
Subject: [PATCH] fix

---
 .../lz/modules/performance/dao/IndicatorLibraryMapper.java | 4 ++--
 .../service/impl/IndicatorLibraryServiceImpl.java          | 2 +-
 .../mapper/performance/IndicatorLibraryMapper.xml          | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java
index 48f62c85..bd648613 100644
--- a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java
+++ b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java
@@ -42,11 +42,11 @@ public interface IndicatorLibraryMapper extends BaseMapper<IndicatorLibrary> {
 
 	void updateIndicatorLibrarysMove(@Param("ids")List<Long> ids,@Param("indicatorType")Long indicatorType);
 
-	List<StatisticalIndicatorTypeRes> statisticalByType(Long type);
+	List<StatisticalIndicatorTypeRes> statisticalByType(@Param("type") Long type);
 
 	int deleteIndicatorLibrarysByIndicatorType(@Param("indicatorType") Integer indicatorType);
 
-	int countIndicatorLibrarysByIndicatorType(@Param("indicatorType") Integer indicatorType);
+	int countIndicatorLibrarysByIndicatorType(@Param("indicatorType") Integer indicatorType,@Param("type") Long type);
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java
index 0ea56e02..02eb4eda 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java
@@ -105,7 +105,7 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl<IndicatorLibraryMap
 		dto.setName("未分类指标");
 		dto.setIndicatorType(0);
 		dto.setDelete(1);
-		int count = indicatorLibraryMapper.countIndicatorLibrarysByIndicatorType(0);
+		int count = indicatorLibraryMapper.countIndicatorLibrarysByIndicatorType(0,type);
 		dto.setCount(count);
 		if(count>0){
 			dtos.add(dto);
diff --git a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml
index 9d2185e4..c81a8472 100644
--- a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml
+++ b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml
@@ -153,7 +153,12 @@
 
     <select id="countIndicatorLibrarysByIndicatorType" resultType="java.lang.Integer">
         select COUNT(1) from lz_indicator_library  where indicator_type=#{indicatorType} and is_delete = 0
-        and type in (SELECT id from lz_result_dimension where is_delete = 0)
+        <if test="type!=null and type!=0">
+            and type = #{type}
+        </if>
+        <if test="type==null or type==0">
+            and type in (SELECT id from lz_result_dimension where is_delete = 0)
+        </if>
     </select>