|
@@ -107,14 +107,14 @@ public class CaoYaoYiZhuService {
|
|
|
IPage<YzOrderPatternCy> page = new Page<>(currentPage, pageSize, total == 0);
|
|
|
String name = StringUtil.englishToCapital(queryName);
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
- qw.and(QueryWrapper -> QueryWrapper
|
|
|
+ qw.and(q -> q
|
|
|
.like("py_code", name)
|
|
|
.or()
|
|
|
.like("d_code", name)
|
|
|
.or()
|
|
|
.like("pattern_name", name)
|
|
|
);
|
|
|
- if (publicServer.noNeedRule(1, 38)) {
|
|
|
+ if (publicServer.noNeedRule(38)) {
|
|
|
if (StringUtil.notBlank(deptCode)) {
|
|
|
qw.eq("dept_code", deptCode);
|
|
|
}
|