commit

src/main/java/com/budwk/app/flow/controller/FlowDesignController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.ClassScanner;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -21,6 +22,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -220,9 +222,16 @@ public class FlowDesignController {
     @At
     @SaCheckLogin
     @ApiOperation("获取流程设计任务参与者分页数据")
-    public Result assigneePage(Integer pageNumber, Integer pageSize, String keyword, @Param("userIds") String[] userIds) {
+    public Result assigneePage(Integer pageNumber, Integer pageSize, String searchKeyword, @Param("userIds") String[] userIds) {
         Sql sql = Sqls.create("select id,loginname,username,unitName from vw_user $condition");
         Cnd cnd = Cnd.NEW();
+		if(StrUtil.isNotBlank(searchKeyword)) {
+			SqlExpressionGroup group = new SqlExpressionGroup();
+			group.orLike("username", searchKeyword);
+			group.orLike("loginname", searchKeyword);
+			cnd.and(group);
+		}
+		sql.setCondition(cnd);
 //        cnd.andEX("id", "in", userIds);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
         return Result.success(pagination);