调整获取数字字典接口(适配客户端工单服务需求)

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java

@@ -125,7 +125,7 @@ public class DictBizCache {
 	public static List<DictBiz> getList(String code) {
 		String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
 		return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> {
-			R<List<DictBiz>> result = getDictClient().getList(code);
+			R<List<DictBiz>> result = getDictClient().getList(code, "notRoot");
 			return result.getData();
 		});
 	}

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClient.java

@@ -65,9 +65,10 @@ public interface IDictBizClient {
 	 * 获取字典表
 	 *
 	 * @param code 字典编号
+	 * @param notRoot 为空则会获取根节点，反之不会
 	 * @return
 	 */
 	@GetMapping(GET_LIST)
-	R<List<DictBiz>> getList(@RequestParam("code") String code);
+	R<List<DictBiz>> getList(@RequestParam("code") String code, @RequestParam("notRoot") String notRoot);
 
 }

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictBizClientFallback.java

@@ -40,7 +40,7 @@ public class IDictBizClientFallback implements IDictBizClient {
 	}
 
 	@Override
-	public R<List<DictBiz>> getList(String code) {
+	public R<List<DictBiz>> getList(String code, String notRoot) {
 		return R.fail("获取数据失败");
 	}
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java

@@ -56,8 +56,8 @@ public class DictBizClient implements IDictBizClient {
 
 	@Override
 	@GetMapping(GET_LIST)
-	public R<List<DictBiz>> getList(String code) {
-		return R.data(service.getList(code));
+	public R<List<DictBiz>> getList(String code, String notRoot) {
+		return R.data(service.getList(code, notRoot));
 	}
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java

@@ -18,6 +18,7 @@ package org.springblade.system.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.vo.DictBizVO;
 
@@ -45,7 +46,7 @@ public interface DictBizMapper extends BaseMapper<DictBiz> {
 	 * @param code 字典编号
 	 * @return
 	 */
-	List<DictBiz> getList(String code);
+	List<DictBiz> getList(@Param("code") String code, @Param("notRoot") String notRoot);
 
 	/**
 	 * 获取树形节点

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml

@@ -37,7 +37,11 @@
     </select>-->
 
     <select id="getList" resultMap="dictResultMap">
-        select id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0
+        select id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1}
+        <if test="notRoot != null and notRoot != ''">
+            and parent_id > 0
+        </if>
+        and is_sealed = 0 and is_deleted = 0
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">

blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java

@@ -62,7 +62,7 @@ public interface IDictBizService extends IService<DictBiz> {
 	 * @param code 字典编号
 	 * @return
 	 */
-	List<DictBiz> getList(String code);
+	List<DictBiz> getList(String code, String notRoot);
 
 	/**
 	 * 新增或修改

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java

@@ -67,8 +67,8 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 	}
 
 	@Override
-	public List<DictBiz> getList(String code) {
-		return baseMapper.getList(code);
+	public List<DictBiz> getList(String code, String notRoot) {
+		return baseMapper.getList(code, notRoot);
 	}
 
 	@Override