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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -265,14 +265,16 @@ public class DataDictionaryController extends BaseController {
 		queryWrapper.eq("type", type);
 		queryWrapper.orderByAsc("sort_num");
 		Collection<DataDictionary> list = null;
+		List<Menu> menus  =null;
 		if ("YJLDDW".equals(type)) {
 			list =	dataDictionaryMapper.getNoInLinkUnit();
+			menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
+					null);
 		} else {
 			list = iDataDictionaryService.list(queryWrapper);
-			
+			menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
+					null);
 		}
-		List<Menu> menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-				null);
 		// 创建根节点
 		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
 		List<Menu> menuList = new ArrayList<>();

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

@@ -29,7 +29,9 @@ GROUP BY
 
 <select id ="getNoInLinkUnit" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 SELECT
-	cbb.*
+CONCAT(cbb.`name`,' (',elink.count,')') as `name`,
+	cbb.*,
+	elink.count as count
 FROM
 	cb_data_dictionary cbb
 LEFT JOIN (
@@ -42,7 +44,7 @@ LEFT JOIN (
 		emergency_linkage_unit_code
 ) elink ON elink.emergency_linkage_unit_code = cbb.`code`
 WHERE
-	cbb.type = 'YJLDDW'
+	cbb.type = 'YJLDDW' and cbb.is_delete = 0
 AND elink.count IS NOT NULL
 </select>
 </mapper>