图稿库

sd-business/src/main/java/com/sd/business/entity/artwork/po/ArtworkLibrary.java

@@ -25,7 +25,7 @@ public class ArtworkLibrary extends BasePo {
      * 部门id
      */
     @NotNull(message = "部门id不能为空")
-    private Long departmentId;
+    private String departmentId;
 
     /**
      * 图稿名称

sd-business/src/main/java/com/sd/business/service/artwork/impl/ArtworkLibraryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sd.business.service.artwork.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,7 +38,7 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
     public Page<ArtworkLibraryVo> getPage(ArtworkLibrarySelectDto dto) {
         IWrapper<ArtworkLibrary> wrapper = getWrapper();
         wrapper.like("al", ArtworkLibrary::getArtworkName, dto.getArtworkName());
-        wrapper.eq("al", ArtworkLibrary::getDepartmentId, dto.getDepartmentId());
+        wrapper.apply(ObjectUtil.isNotEmpty(dto.getDepartmentId()), "find_in_set({0}, al.department_id)", dto.getDepartmentId());
         wrapper.orderByDesc("al", ArtworkLibrary::getId);
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }