diff --git a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java index 355605c5..42d67b6c 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java @@ -67,8 +67,8 @@ public class FlowTodoCenterController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("ta.actorId", "=", SecurityUtil.getUserId()); - cnd.andEX("def.category","=",category); - if(StrUtil.isNotBlank(searchKeyword)){ + cnd.andEX("def.category", "=", category); + if (StrUtil.isNotBlank(searchKeyword)) { cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword); } cnd.desc("t.createdAt"); @@ -111,8 +111,8 @@ public class FlowTodoCenterController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskState", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.and("ta.actorId", "=", SecurityUtil.getUserId()); - cnd.andEX("def.category","=",category); - if(StrUtil.isNotBlank(searchKeyword)){ + cnd.andEX("def.category", "=", category); + if (StrUtil.isNotBlank(searchKeyword)) { cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword); } cnd.desc("t.createdAt"); @@ -150,8 +150,46 @@ public class FlowTodoCenterController { """); Cnd cnd = Cnd.NEW(); cnd.and("ins.operator", "=", SecurityUtil.getUserId()); - cnd.andEX("def.category","=",category); - if(StrUtil.isNotBlank(searchKeyword)){ + cnd.andEX("def.category", "=", category); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword); + } + cnd.groupBy("ins.id"); + cnd.desc("ins.createdAt"); + sql.setCondition(cnd); + Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql); + List list = pagination.getList(); + for (NutMap row : list) { + NutMap variable = Json.fromJson(NutMap.class, row.getString("variable")); + row.put("variable", variable); + } + return Result.success(pagination); + } + + @At + @SaCheckLogin + public Result completed(Integer pageNumber, Integer pageSize, String searchKeyword, String category) { + Sql sql = Sqls.create(""" + SELECT + ins.id AS instanceId, + ins.processDefineId, + ins.state, + ins.businessNo, + ins.operator, + ins.variable, + ins.createdAt, + ins.variable ->> '$.instanceName' AS instanceName, + cat.`name` categoryName + FROM + wf_process_instance ins + LEFT JOIN wf_process_define def ON def.id = ins.processDefineId + LEFT JOIN wf_process_category cat ON cat.id = def.category + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("ins.state", "=", 20); + cnd.and("ins.operator", "=", SecurityUtil.getUserId()); + if (StrUtil.isNotBlank(searchKeyword)) { cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword); } cnd.groupBy("ins.id"); diff --git a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java index d2915eda..f468276c 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java @@ -503,5 +503,25 @@ public class SysRoleController { cnd.and(Cnd.exps("parentId", "is", null).or("parentId", "=", "")); return Result.success(Daos.ext(sysRoleService.dao(), fieldFilter).query(Sys_menu.class, cnd)); } + @At + @Ok("json:full") + @SaCheckLogin + public Result getRoleNames(){ + Sql sql = Sqls.create(""" + SELECT + GROUP_CONCAT(DISTINCT sr.`name`) roleNames + FROM + `sys_user_role` sur + LEFT JOIN sys_role sr ON sr.id = sur.roleId + WHERE + sur.userId = @userId + ORDER BY + sr.sort DESC + """).setParam("userId", SecurityUtil.getUserId()); + sql.setCallback(Sqls.callback.map()); + sysRoleService.dao().execute(sql); + return Result.success(sql.getResult()); + + } } diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js index 2de29cfb..7ae0c5c7 100644 --- a/src/main/resources/static/assets/platform/js/util/commonUtil.js +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -17,7 +17,7 @@ const commonUtil = { if (response.config.responseType === "blob") { return response } - if (response.data && response.data.code !== 0 && response.data.code !== 99) { + if (response.data && response.data.code !== "200" && response.data.code !== 0 && response.data.code !== 99) { if (isMobile) { vant.Toast.fail(response.data.msg) } else { @@ -318,7 +318,7 @@ function base64ToFile(base64Data, filename) { return new File([blob], filename, {type: contentType}) } -function createLoading(text= '加载中...'){ +function createLoading(text = '加载中...') { return ELEMENT.Loading.service({ lock: true, text: text, diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index 6d72f118..30e4b676 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -11,6 +11,7 @@ + @@ -97,7 +98,7 @@ l src="https://webapi.amap.com/maps?v=2.0&key=b4fa2e2bc10a725ab007b98a3aa447cc&plugin=AMap.PolyEditor,AMap.Geolocation" >--> - +