Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -28,25 +28,24 @@ GROUP BY
 
 
 <select id ="getNoInLinkUnit" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
-SELECT
-CONCAT(cbb.`name`,' (',elink.count,')') as `name`,
-	cbb.*,
-	elink.count as count
-FROM
-	cb_data_dictionary cbb
-LEFT JOIN (
 	SELECT
+		CONCAT(cbb.`name`,' (',IFNULL(elink.count, 0),')') as `name`,
+		cbb.*,
+		elink.count as count
+	FROM
+		cb_data_dictionary cbb
+		LEFT JOIN (
+		SELECT
 		emergency_linkage_unit_code,
 		COUNT(1) count
-	FROM
+		FROM
 		cb_linkage_unit
-	WHERE is_delete = 0
-	GROUP BY
+		WHERE is_delete = 0
+		GROUP BY
 		emergency_linkage_unit_code
-) elink ON elink.emergency_linkage_unit_code = cbb.`code`
-WHERE
-	cbb.type = 'YJLDDW' and cbb.is_delete = 0
-AND elink.count IS NOT NULL
+		) elink ON elink.emergency_linkage_unit_code = cbb.`code`
+	WHERE
+		cbb.type = 'YJLDDW' and cbb.is_delete = 0
 </select>
 
 	<select id ="getByCode" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">