feat(picker): 列筛选下推,支持表单级联(组织→部门→岗位)

PickerController.list() 在 q 模糊查之后追加 applyColumnFilters:把请求里
按真实表列名传入的等值过滤参(白名单=该表真实列,排除 q/page/perPage/op
/value/_id/asUser/roles/asDepart/asOrg 等控制参)下推为等值条件,空值跳过,
escapeLikeValue 防注入。

配合转换器 filterscript 级联:上级选择框变化后 amis 以 &COL=${TRIG} 重拉
本选择框 source,由此端点据列值过滤,实现组织→部门→岗位的联动下拉。

PickerControllerTest 扩充覆盖列筛选/白名单/空值/转义。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-17 16:32:33 +08:00
parent abc32af6e9
commit d427be2802
2 changed files with 181 additions and 27 deletions

View File

@@ -27,6 +27,7 @@ import com.dsasp.server.common.exception.PrivilegeException;
import com.dsasp.server.common.user.service.LoggedInUser; import com.dsasp.server.common.user.service.LoggedInUser;
import com.dsasp.server.common.util.UserSession; import com.dsasp.server.common.util.UserSession;
import com.dsasp.server.dataDic.bean.POInfo; import com.dsasp.server.dataDic.bean.POInfo;
import com.eip4.platform.metadata.flow.UserColumnResolver;
import com.eip4.platform.metadata.security.IdentifierWhitelist; import com.eip4.platform.metadata.security.IdentifierWhitelist;
import com.eip4.platform.metadata.security.IllegalIdentifierException; import com.eip4.platform.metadata.security.IllegalIdentifierException;
@@ -72,15 +73,19 @@ public class PickerController {
private final DataDicService dataDicService; private final DataDicService dataDicService;
private final IdentifierWhitelist identifierWhitelist; private final IdentifierWhitelist identifierWhitelist;
private final JdbcTemplate jdbcTemplate; private final JdbcTemplate jdbcTemplate;
/** 与功能列表(FlowController)同一套引用列显名解析——picker 行也补 {COL}_DISPLAY__,列改指显名。 */
private final UserColumnResolver userColumnResolver;
public PickerController(POJOCRUDService pojoCRUDService, public PickerController(POJOCRUDService pojoCRUDService,
DataDicService dataDicService, DataDicService dataDicService,
IdentifierWhitelist identifierWhitelist, IdentifierWhitelist identifierWhitelist,
JdbcTemplate jdbcTemplate) { JdbcTemplate jdbcTemplate,
UserColumnResolver userColumnResolver) {
this.pojoCRUDService = pojoCRUDService; this.pojoCRUDService = pojoCRUDService;
this.dataDicService = dataDicService; this.dataDicService = dataDicService;
this.identifierWhitelist = identifierWhitelist; this.identifierWhitelist = identifierWhitelist;
this.jdbcTemplate = jdbcTemplate; this.jdbcTemplate = jdbcTemplate;
this.userColumnResolver = userColumnResolver;
} }
/** /**
@@ -176,6 +181,12 @@ public class PickerController {
if (q != null && !q.isBlank() && labelColumn != null) { if (q != null && !q.isBlank() && labelColumn != null) {
cond.put(labelColumn, escapeLikeValue(q.trim())); cond.put(labelColumn, escapeLikeValue(q.trim()));
} }
// filterscript 级联过滤(组织→部门→岗位等):转换器把字段 filterscript 的 setFilter 语义译成
// source 上的 &FILTERCOL=${TRIGGER} 查询参(见 TemplateToAmisConverter.applyFilterscriptCascade)。
// 这里把 allParams 里「命中本表真实列名」的非空参作等值条件下推(值经 escapeLikeValue 转义;引擎对
// String 条件走 col like '%值%',恰好匹配 CHAR(36) 主键的尾空格补白值)。非表列/控制参/空值一律忽略
// ——表列名匹配本身即白名单,杜绝任意列注入;空值不下推(amis 触发器未选时列出全部,不致误清空)。
applyColumnFilters(cond, info, allParams);
Map<String, Object> result; Map<String, Object> result;
try { try {
@@ -195,6 +206,9 @@ public class PickerController {
} }
List<Map<String, Object>> rows = toRows(result.get(POJOCRUDService.LIST_RESULT)); List<Map<String, Object>> rows = toRows(result.get(POJOCRUDService.LIST_RESULT));
// 统一引用列解析:与功能列表(FlowController.executePost → userColumnResolver.resolveRows)完全同一套,
// 给每行补 {COL}_DISPLAY__(如 PARENTID→父组织名/DEPARTID→部门名),修「picker 列父级组织等显裸 id」。
userColumnResolver.resolveRows(table, rows);
List<Map<String, Object>> options = new ArrayList<>(); List<Map<String, Object>> options = new ArrayList<>();
for (Map<String, Object> row : rows) { for (Map<String, Object> row : rows) {
Object rowId = row.get("_id"); Object rowId = row.get("_id");
@@ -213,12 +227,17 @@ public class PickerController {
// 选择窗多列:优先用 dialog(view_template)<display> 里显式声明的列(忠实复刻老系统弹窗列序, // 选择窗多列:优先用 dialog(view_template)<display> 里显式声明的列(忠实复刻老系统弹窗列序,
// 如用品选择「用品类别/用品名称/规格/单位/重要性/库存数量」);无模板 display(孤儿模板/直连实体) // 如用品选择「用品类别/用品名称/规格/单位/重要性/库存数量」);无模板 display(孤儿模板/直连实体)
// 才回落实体元数据启发式 gridColumns。修「多选弹窗列不对(仅显 名称+裸类别 id)」。 // 才回落实体元数据启发式 gridColumns。修「多选弹窗列不对(仅显 名称+裸类别 id)」。
List<Map<String, Object>> displayCols = displayColumnsFromTemplate(entityOrRef); List<Map<String, Object>> cols = displayColumnsFromTemplate(entityOrRef);
if (cols == null) {
cols = gridColumns(table, info, keyColumn, labelColumn);
}
// 引用列改指显名:列 name=PARENTID 且行已补 PARENTID_DISPLAY__ → 列 name 改 PARENTID_DISPLAY__,
// amis 按 name 取行字段 → 显父组织名而非裸 id(label 保留)。与功能列表(FlowController)同口径。
remapReferenceColumnsToDisplay(cols, rows);
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("items", rows); // amis crud/picker 内嵌 CRUD 直接消费 data.put("items", rows); // amis crud/picker 内嵌 CRUD 直接消费
data.put("options", options); // amis select 的 source 直接消费 data.put("options", options); // amis select 的 source 直接消费
data.put("columns", displayCols != null ? displayCols data.put("columns", cols); // amis picker 内嵌 CRUD 按响应 columns 渲染多列
: gridColumns(table, info, keyColumn, labelColumn)); // amis picker 内嵌 CRUD 按响应 columns 渲染多列
data.put("total", result.get(POJOCRUDService.PAGE_COUNT)); data.put("total", result.get(POJOCRUDService.PAGE_COUNT));
Map<String, Object> resp = new HashMap<>(); Map<String, Object> resp = new HashMap<>();
@@ -228,6 +247,71 @@ public class PickerController {
return resp; return resp;
} }
/**
* 引用列改指显名:对每个列,若其 {@code name=COL} 且行内已补 {@code COL_DISPLAY__}(由
* {@link UserColumnResolver#resolveRows} 填),把列 {@code name} 改为 {@code COL_DISPLAY__}
* → amis 按 name 取行字段渲染,显引用对象名(如父组织名/部门名)而非裸 id,列 {@code label} 不变。
* 与功能列表(FlowController)的引用列显名口径一致。空列/空行 → no-op。
*/
private static void remapReferenceColumnsToDisplay(List<Map<String, Object>> cols,
List<Map<String, Object>> rows) {
if (cols == null || cols.isEmpty() || rows == null || rows.isEmpty()) {
return;
}
Map<String, Object> sample = rows.get(0);
for (Map<String, Object> col : cols) {
Object nameObj = col.get("name");
if (!(nameObj instanceof String name) || name.isBlank() || name.endsWith("_DISPLAY__")) {
continue;
}
if (sample.containsKey(name + "_DISPLAY__")) {
col.put("name", name + "_DISPLAY__");
}
}
}
/** {@link #list} 的控制参(非过滤列):这些键即便撞上表列名也不作过滤条件。 */
private static final java.util.Set<String> LIST_CONTROL_PARAMS = java.util.Set.of(
"Q", "PAGE", "PERPAGE", "OP", "VALUE", "_ID",
"ASUSER", "ROLES", "ASDEPART", "ASORG");
/**
* filterscript 级联列过滤:把 {@code allParams} 里「命中本表真实列名(大小写不敏感)且非控制参、非空值」
* 的参作等值条件加进 {@code cond}(值经 {@link #escapeLikeValue} 转义)。表列名匹配本身即白名单——
* 任意非列参(amis 内部参/未知参)天然被忽略,杜绝任意列注入。空值参不下推(amis 级联触发器未选时
* 不致把列表误清空,而是列出全部,与级联渐进收窄的 UX 一致)。
*/
private void applyColumnFilters(Map<String, Object> cond, POJOInfo info,
MultiValueMap<String, String> allParams) {
if (cond == null || info == null || allParams == null || allParams.isEmpty()) {
return;
}
// 本表真实列名集合(大写)——级联过滤的白名单
java.util.Set<String> columns = new java.util.HashSet<>();
for (int i = 0; i < info.getColumnCount(); i++) {
String c = info.getColumnName(i);
if (c != null && !c.isBlank()) {
columns.add(c.toUpperCase());
}
}
for (Map.Entry<String, List<String>> e : allParams.entrySet()) {
String key = e.getKey();
if (key == null || key.isBlank()) {
continue;
}
String keyUp = key.toUpperCase();
if (LIST_CONTROL_PARAMS.contains(keyUp) || !columns.contains(keyUp)) {
continue; // 控制参 / 非本表列 → 忽略
}
List<String> vals = e.getValue();
String v = (vals == null || vals.isEmpty()) ? null : vals.get(0);
if (v == null || v.isBlank()) {
continue; // 空值(触发器未选)→ 不下推,列出全部
}
cond.put(keyUp, escapeLikeValue(v.trim()));
}
}
/** /**
* 选择窗回显解析:{@code GET /api/picker/{entityOrRef}/resolve?value=}。 * 选择窗回显解析:{@code GET /api/picker/{entityOrRef}/resolve?value=}。
* *

View File

@@ -33,6 +33,7 @@ import com.dsasp.server.common.dataDic.service.DataDicService;
import com.dsasp.server.common.dataDic.service.POJOCRUDService; import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.dsasp.server.common.user.service.LoggedInUser; import com.dsasp.server.common.user.service.LoggedInUser;
import com.dsasp.server.common.exception.PrivilegeException; import com.dsasp.server.common.exception.PrivilegeException;
import com.eip4.platform.metadata.flow.UserColumnResolver;
import com.eip4.platform.metadata.security.IdentifierWhitelist; import com.eip4.platform.metadata.security.IdentifierWhitelist;
import com.eip4.platform.metadata.security.IllegalIdentifierException; import com.eip4.platform.metadata.security.IllegalIdentifierException;
@@ -137,7 +138,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);
assertEquals(0, resp.get("status")); assertEquals(0, resp.get("status"));
@@ -162,7 +163,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// path 用实体表名(小写也可,内部 toUpperCase) // path 用实体表名(小写也可,内部 toUpperCase)
Map<String, Object> resp = c.list("sys_usergroup", null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list("sys_usergroup", null, 1, 20, null, null, null, null, null, null, null, null);
@@ -179,7 +180,7 @@ class PickerControllerTest {
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult()); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
c.list(REF_ID, "管理'员%组", 1, 20, null, null, null, null, null, null, null, null); c.list(REF_ID, "管理'员%组", 1, 20, null, null, null, null, null, null, null, null);
@@ -200,7 +201,7 @@ class PickerControllerTest {
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult()); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
c.list(REF_ID, null, 3, 15, null, null, null, null, null, null, null, null); c.list(REF_ID, null, 3, 15, null, null, null, null, null, null, null, null);
@@ -211,6 +212,75 @@ class PickerControllerTest {
assertEquals(15, condCap.getValue().get(POJOCRUDService.PAGE_SIZE)); assertEquals(15, condCap.getValue().get(POJOCRUDService.PAGE_SIZE));
} }
/** fakeInfo 之上再加一列 PARENTORGID(filterscript 级联过滤列),供列过滤测试白名单命中。 */
private POJOInfo fakeInfoWithParentOrg() {
POJOInfo info = mock(POJOInfo.class);
when(info.hasKeyColumn()).thenReturn(true);
when(info.getKeyColumnName()).thenReturn(KEY);
when(info.getColumnCount()).thenReturn(3);
when(info.getColumnName(0)).thenReturn(KEY);
when(info.getColumnName(1)).thenReturn(LABEL);
when(info.getColumnName(2)).thenReturn("PARENTORGID");
when(info.isIdentifier(0)).thenReturn(false);
when(info.isIdentifier(1)).thenReturn(true);
when(info.isIdentifier(2)).thenReturn(false);
when(info.getDisplayIndex()).thenReturn(1);
org.mockito.Mockito.doReturn(String.class).when(info).getColumnClass(org.mockito.ArgumentMatchers.anyInt());
return info;
}
@Test
@DisplayName("3b. 级联列过滤:allParams 里命中表真实列的参 → 转义后进引擎等值条件(filterscript 级联)")
void listAppliesColumnFilterFromAllParams() {
POJOCRUDService engine = mock(POJOCRUDService.class);
DataDicService dic = mock(DataDicService.class);
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfoWithParentOrg());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
org.springframework.util.MultiValueMap<String, String> all =
new org.springframework.util.LinkedMultiValueMap<>();
all.add("PARENTORGID", "org-123");
all.add("page", "1"); // 控制参,不得当过滤列
all.add("perPage", "20"); // 控制参,不得当过滤列
c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, all);
@SuppressWarnings("unchecked")
ArgumentCaptor<Map<String, Object>> condCap = ArgumentCaptor.forClass(Map.class);
verify(engine).listSelect(condCap.capture(), eq(TABLE), any(Properties.class));
Map<String, Object> cond = condCap.getValue();
assertEquals("org-123", cond.get("PARENTORGID")); // 真实列 → 等值过滤条件(值无特殊字符,转义后不变)
assertFalse(cond.containsKey("page")); // 控制参不进条件
assertFalse(cond.containsKey("perPage"));
}
@Test
@DisplayName("3c. 级联列过滤:非表列参与空值参一律忽略,不污染引擎条件")
void listIgnoresUnknownAndBlankColumnParams() {
POJOCRUDService engine = mock(POJOCRUDService.class);
DataDicService dic = mock(DataDicService.class);
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfoWithParentOrg());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
org.springframework.util.MultiValueMap<String, String> all =
new org.springframework.util.LinkedMultiValueMap<>();
all.add("NOTACOLUMN", "x"); // 非表列 → 忽略
all.add("PARENTORGID", ""); // 空值(如 amis 触发器未选)→ 忽略(不过滤,列出全部)
c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, all);
@SuppressWarnings("unchecked")
ArgumentCaptor<Map<String, Object>> condCap = ArgumentCaptor.forClass(Map.class);
verify(engine).listSelect(condCap.capture(), eq(TABLE), any(Properties.class));
Map<String, Object> cond = condCap.getValue();
assertFalse(cond.containsKey("NOTACOLUMN"));
assertFalse(cond.containsKey("PARENTORGID")); // 空值不下推
}
@Test @Test
@DisplayName("5. 白名单负例:解析出的表名非法 → 抛 IllegalIdentifierException(异常处理器转 400)") @DisplayName("5. 白名单负例:解析出的表名非法 → 抛 IllegalIdentifierException(异常处理器转 400)")
void illegalTableRejected() { void illegalTableRejected() {
@@ -220,7 +290,7 @@ class PickerControllerTest {
when(dic.getReferenceEntityTableName("NOPE")).thenReturn(null); when(dic.getReferenceEntityTableName("NOPE")).thenReturn(null);
doThrow(new IllegalIdentifierException("非法实体或元数据不存在: NOPE")) doThrow(new IllegalIdentifierException("非法实体或元数据不存在: NOPE"))
.when(wl).requireLegalTable(eq("NOPE")); .when(wl).requireLegalTable(eq("NOPE"));
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
IllegalIdentifierException ex = assertThrows(IllegalIdentifierException.class, IllegalIdentifierException ex = assertThrows(IllegalIdentifierException.class,
() -> c.list("nope", null, 1, 20, null, null, null, null, null, null, null, null)); () -> c.list("nope", null, 1, 20, null, null, null, null, null, null, null, null));
@@ -236,7 +306,7 @@ class PickerControllerTest {
when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE);
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult()); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
c.list(REF_ID, null, 1, 20, null, null, null, "alice", "role-a,role-b", null, null, null); c.list(REF_ID, null, 1, 20, null, null, null, "alice", "role-a,role-b", null, null, null);
@@ -259,7 +329,7 @@ class PickerControllerTest {
POJOInfo noKey = mock(POJOInfo.class); POJOInfo noKey = mock(POJOInfo.class);
when(noKey.hasKeyColumn()).thenReturn(false); when(noKey.hasKeyColumn()).thenReturn(false);
seedPoInfoCache(TABLE, noKey); seedPoInfoCache(TABLE, noKey);
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
assertThrows(IllegalIdentifierException.class, assertThrows(IllegalIdentifierException.class,
() -> c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null)); () -> c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null));
@@ -294,7 +364,7 @@ class PickerControllerTest {
when(dic.getSYSEntity(entityId)).thenReturn(sysEntity); when(dic.getSYSEntity(entityId)).thenReturn(sysEntity);
when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))).thenReturn(engineResult()); when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))).thenReturn(engineResult());
seedPoInfoCache("PM_PROJECT", fakeInfo()); seedPoInfoCache("PM_PROJECT", fakeInfo());
PickerController c = new PickerController(engine, dic, wl, jdbc); PickerController c = new PickerController(engine, dic, wl, jdbc, new UserColumnResolver(jdbc));
Map<String, Object> resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null);
assertEquals(0, resp.get("status")); assertEquals(0, resp.get("status"));
@@ -326,7 +396,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("u1", "罗来伟")); Map<String, Object> result = engineResult(fakeRow("u1", "罗来伟"));
when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result);
seedPoInfoCache("VIEW_SYS_USER", fakeInfo()); seedPoInfoCache("VIEW_SYS_USER", fakeInfo());
PickerController c = new PickerController(engine, dic, wl, jdbc); PickerController c = new PickerController(engine, dic, wl, jdbc, new UserColumnResolver(jdbc));
Map<String, Object> resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null);
@@ -378,7 +448,7 @@ class PickerControllerTest {
result.put(POJOCRUDService.LIST_RESULT, List.of(row)); result.put(POJOCRUDService.LIST_RESULT, List.of(row));
result.put(POJOCRUDService.PAGE_COUNT, 1L); result.put(POJOCRUDService.PAGE_COUNT, 1L);
when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result);
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);
@@ -410,7 +480,7 @@ class PickerControllerTest {
// 引擎只接受 ADMIN 上下文调用(此处不限 ctx,但后面断言 ctx.CURRENTUSER==ADMIN) // 引擎只接受 ADMIN 上下文调用(此处不限 ctx,但后面断言 ctx.CURRENTUSER==ADMIN)
when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result);
seedPoInfoCache("VIEW_SYS_USER", fakeInfo()); seedPoInfoCache("VIEW_SYS_USER", fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// 以非 admin 用户身份调用(asUser=ceshi,模拟真实登录用户) // 以非 admin 用户身份调用(asUser=ceshi,模拟真实登录用户)
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);
@@ -449,7 +519,7 @@ class PickerControllerTest {
when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))) when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class)))
.thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限")); .thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限"));
seedPoInfoCache("PM_PROJECT", fakeInfo()); seedPoInfoCache("PM_PROJECT", fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// 不应抛异常,不应 500 // 不应抛异常,不应 500
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);
@@ -489,7 +559,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.resolve(REF_ID, "g1", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, "g1", null, null, null, null);
@@ -525,7 +595,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> listResp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> listResp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -554,7 +624,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g2", "普通组"), fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g2", "普通组"), fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.resolve(REF_ID, "g1,g2", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, "g1,g2", null, null, null, null);
@@ -580,7 +650,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.resolve(REF_ID, "g1,gX", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, "g1,gX", null, null, null, null);
@@ -601,7 +671,7 @@ class PickerControllerTest {
POJOCRUDService engine = mock(POJOCRUDService.class); POJOCRUDService engine = mock(POJOCRUDService.class);
DataDicService dic = mock(DataDicService.class); DataDicService dic = mock(DataDicService.class);
IdentifierWhitelist wl = mock(IdentifierWhitelist.class); IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.resolve(REF_ID, " ", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, " ", null, null, null, null);
@@ -624,7 +694,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1 ", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1 ", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// 入参也带补白("g1 ") // 入参也带补白("g1 ")
Map<String, Object> resp = c.resolve(REF_ID, "g1 ", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, "g1 ", null, null, null, null);
@@ -649,7 +719,7 @@ class PickerControllerTest {
when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))) when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class)))
.thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限")); .thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限"));
seedPoInfoCache("PM_PROJECT", fakeInfo()); seedPoInfoCache("PM_PROJECT", fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.resolve(REF_ID, "p1", null, null, null, null); Map<String, Object> resp = c.resolve(REF_ID, "p1", null, null, null, null);
@@ -681,7 +751,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// amis 同时带 value 与 _id;op=loadOptions → 短路解析 // amis 同时带 value 与 _id;op=loadOptions → 短路解析
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, "loadOptions", "g1", "g1", Map<String, Object> resp = c.list(REF_ID, null, 1, 20, "loadOptions", "g1", "g1",
@@ -716,7 +786,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// value=null,_id=g1 // value=null,_id=g1
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, "loadOptions", null, "g1", Map<String, Object> resp = c.list(REF_ID, null, 1, 20, "loadOptions", null, "g1",
@@ -743,7 +813,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
// amis 多选序列化:value[0]=g1&value[1]=g2&op=loadOptions(scalar value/_id 均空) // amis 多选序列化:value[0]=g1&value[1]=g2&op=loadOptions(scalar value/_id 均空)
org.springframework.util.MultiValueMap<String, String> all = org.springframework.util.MultiValueMap<String, String> all =
@@ -778,7 +848,7 @@ class PickerControllerTest {
Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组")); Map<String, Object> result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组"));
when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result);
seedPoInfoCache(TABLE, fakeInfo()); seedPoInfoCache(TABLE, fakeInfo());
PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc(), new UserColumnResolver(emptyTemplateJdbc()));
Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); Map<String, Object> resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null);