|
|
@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Set; |
|
|
|
import java.util.Set; |
|
|
@ -54,6 +55,12 @@ public class DirectoryTableServiceImpl extends BaseServiceImpl<DirectoryTableMap |
|
|
|
dirIds.add(table.getDirId()); |
|
|
|
dirIds.add(table.getDirId()); |
|
|
|
wrapper.clear(); |
|
|
|
wrapper.clear(); |
|
|
|
wrapper.in("DIRECTORY_ID", dirIds); |
|
|
|
wrapper.in("DIRECTORY_ID", dirIds); |
|
|
|
|
|
|
|
if (StringUtils.hasText(table.getFormComment())) { |
|
|
|
|
|
|
|
wrapper.and(subWrapper -> subWrapper |
|
|
|
|
|
|
|
.like("FORM_COMMENT", table.getFormComment()) |
|
|
|
|
|
|
|
.or() |
|
|
|
|
|
|
|
.like("FORM_NAME", table.getFormComment())); |
|
|
|
|
|
|
|
} |
|
|
|
return super.page(page, wrapper); |
|
|
|
return super.page(page, wrapper); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|