因code不唯一 修改 根据code查询 增添条件 type 判断条件 code相等 type值相等

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/DataDictionaryDto.java

@@ -30,6 +30,9 @@ public class DataDictionaryDto extends BaseDto {
     @ApiModelProperty(value = "父级")
     private Long parent;
 
+    @ApiModelProperty(value = "类型说明")
+    private String typeDesc;
+
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -37,6 +37,9 @@ public class DataDictionary extends BaseEntity {
     @ApiModelProperty(value = "父级")
     private Long parent;
 
+    @ApiModelProperty(value = "类型说明")
+    private String typeDesc;
+
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java

@@ -88,9 +88,9 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     }
 
-    public DataDictionary getByCode(String code)  {
+    public DataDictionary getByCode(String code,String type)  {
 
-        DataDictionary byCode = dataDictionaryMapper.getByCode(code);
+        DataDictionary byCode = dataDictionaryMapper.getByCode(code,type);
         return byCode;
 
     }

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

@@ -55,6 +55,6 @@ AND elink.count IS NOT NULL
 			cb_data_dictionary cbb
 
 		WHERE
-			cbb.code = #{code} and cbb.is_delete = 0
+			cbb.code = #{code} and cbb.is_delete = 0 and cbb.type = #{type}
 	</select>
 </mapper>