commit

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.difficulthelp.vo;
 
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
@@ -8,6 +9,7 @@ import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.lang.Lang;
 
 import java.util.List;
@@ -36,6 +38,13 @@ public class DifficultHelpPageParam extends PageForm<DifficultHelpInfo> {
             cnd = Cnd.NEW();
         }
 
+        if (StrUtil.isNotBlank(this.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike(prefix + "userName", this.getSearchKeyword());
+            seg.orLike(prefix + "loginName", this.getSearchKeyword());
+            cnd.and(seg);
+        }
+
         cnd.andEX("YEAR(" + prefix + "applyTime)", "=", this.getYear());
 
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {