|
@@ -211,7 +211,7 @@ public class DictionaryDemandController {
|
|
|
wrapper.eq(cond.getCreatorCond()!=null&&1==cond.getCreatorCond(),
|
|
|
AuditableEntity.PROP_CREATOR, AppContext.getContext().getAccountId());
|
|
|
// 模糊匹配
|
|
|
- String matchColumn = " concat(code, '@', subject) ";
|
|
|
+ String matchColumn = " concat(ifnull(code, ''), '@', ifnull(subject, '')) ";
|
|
|
wrapper.like(StrUtil.isNotBlank(cond.getMatchingCond()), matchColumn, cond.getMatchingCond());
|
|
|
// 产线
|
|
|
wrapper.in(CollUtil.isNotEmpty(cond.getProductCond()), "product_line", cond.getProductCond());
|