pref#_工会干部审核界面查询异常
This commit is contained in:
@@ -291,6 +291,7 @@ public class SysUnionController {
|
|||||||
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
|
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
|
||||||
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
|
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
|
||||||
$condition
|
$condition
|
||||||
|
$constructionSql
|
||||||
""");
|
""");
|
||||||
|
|
||||||
Cnd cnd = Cnd.where("role.`code`", "in", branchUnionRoleCodes);
|
Cnd cnd = Cnd.where("role.`code`", "in", branchUnionRoleCodes);
|
||||||
@@ -302,8 +303,11 @@ public class SysUnionController {
|
|||||||
case "roleName" -> cnd.where().andLike("role.`name`", pageForm.getSearchKeyword());
|
case "roleName" -> cnd.where().andLike("role.`name`", pageForm.getSearchKeyword());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cnd.and(new Static("1=1 order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")"));
|
|
||||||
sql.setCondition(cnd);
|
sql.setCondition(cnd);
|
||||||
|
|
||||||
|
sql.setVar("constructionSql",
|
||||||
|
new Static(" group by info.id order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")")
|
||||||
|
);
|
||||||
List<NutMap> list = sysUserService.listMap(sql);
|
List<NutMap> list = sysUserService.listMap(sql);
|
||||||
return Result.success(list);
|
return Result.success(list);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user