feat: 标签

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/label/Label.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 @Data
 @ApiModel(value = "LabelLibrary", description = "标签库")
 @TableName("res_Label")
@@ -24,7 +26,5 @@ public class Label extends BasePO {
     private Integer  departmentId;
     @ApiModelProperty(value = "部门")
     private String  departmentCode;
-    @ApiModelProperty(value = "部门")
-    private String  departmentName;
-
-}
+    @ApiModelProperty(value = "部门名称")
+    private String  departmentName;
\ No newline at end of file

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/LabelServiceImpl.java

@@ -96,14 +96,18 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
             }else{
                 if(StringUtils.isNotBlank(code)){
                     departmentCode=code;
+                    labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,departmentCode);
                 }
             }
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
         //查询标签列表
-        List<LabelListVO> list = labelMapper.queryAll(departmentCode);
-        list.forEach(i -> {
+        //List<LabelListVO> listVO = labelMapper.queryAll(departmentCode);
+        List<LabelListVO> listVO = new ArrayList<>();
+        List<Label> list = labelMapper.selectList(labelLambdaQueryWrapper);
+        BeanUtils.copyProperties(list, listVO);
+        listVO.forEach(i -> {
             if (i != null) {
                 StringBuilder dataType = new StringBuilder();
                 List<LabelDataType> li = labelDataTypeMapper.queryByLabelId(i.getId());
@@ -118,7 +122,7 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
                 i.setDataType(dataType.toString());
             }
         });
-        return new PageInfo<>(list);
+        return new PageInfo<>(listVO);
     }
 
     @Override