feat(metadata): restore legacy user transfer picker flow
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
This commit is contained in:
@@ -256,7 +256,7 @@ final class UiTypeMapper {
|
|||||||
} else if (isUserSelectDialog(dialogId)) {
|
} else if (isUserSelectDialog(dialogId)) {
|
||||||
applyUserSelectPicker(item, dialogId, false);
|
applyUserSelectPicker(item, dialogId, false);
|
||||||
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
||||||
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
|
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
||||||
+ userSelectMode(dialogId) + ")");
|
+ userSelectMode(dialogId) + ")");
|
||||||
} else if (isProcessSelectDialog(dialogId)) {
|
} else if (isProcessSelectDialog(dialogId)) {
|
||||||
applyProcessSelectPicker(item, false);
|
applyProcessSelectPicker(item, false);
|
||||||
@@ -294,7 +294,7 @@ final class UiTypeMapper {
|
|||||||
} else if (isUserSelectDialog(dialogId)) {
|
} else if (isUserSelectDialog(dialogId)) {
|
||||||
applyUserSelectPicker(item, dialogId, true);
|
applyUserSelectPicker(item, dialogId, true);
|
||||||
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
||||||
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
|
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
||||||
+ userSelectMode(dialogId) + ", multiple)");
|
+ userSelectMode(dialogId) + ", multiple)");
|
||||||
} else if (isProcessSelectDialog(dialogId)) {
|
} else if (isProcessSelectDialog(dialogId)) {
|
||||||
applyProcessSelectPicker(item, true);
|
applyProcessSelectPicker(item, true);
|
||||||
@@ -425,7 +425,7 @@ final class UiTypeMapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 旧 UserSelectWindow 族 → amis 内建 tabs-transfer-picker。
|
* 旧 UserSelectWindow 族 → 前端自定义 user-transfer-picker。
|
||||||
*
|
*
|
||||||
* <p>四个 framework 定制选择窗没有普通 {@code <crud>} XML,不能走通用 /api/picker。
|
* <p>四个 framework 定制选择窗没有普通 {@code <crud>} XML,不能走通用 /api/picker。
|
||||||
* 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义:
|
* 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义:
|
||||||
@@ -433,18 +433,14 @@ final class UiTypeMapper {
|
|||||||
*/
|
*/
|
||||||
private static void applyUserSelectPicker(Map<String, Object> item, String dialogId, boolean multiple) {
|
private static void applyUserSelectPicker(Map<String, Object> item, String dialogId, boolean multiple) {
|
||||||
String mode = userSelectMode(dialogId);
|
String mode = userSelectMode(dialogId);
|
||||||
item.put("type", "tabs-transfer-picker");
|
item.put("type", "user-transfer-picker");
|
||||||
|
item.put("mode", mode);
|
||||||
item.put("clearable", true);
|
item.put("clearable", true);
|
||||||
item.put("multiple", multiple);
|
item.put("multiple", multiple);
|
||||||
item.put("joinValues", true);
|
item.put("joinValues", true);
|
||||||
item.put("delimiter", ",");
|
item.put("delimiter", ",");
|
||||||
item.put("labelField", "label");
|
item.put("labelField", "label");
|
||||||
item.put("valueField", "value");
|
item.put("valueField", "value");
|
||||||
item.put("source", "/api/user-select/options?mode=" + mode);
|
|
||||||
item.put("searchApi", "/api/user-select/search?mode=" + mode + "&term=${term}");
|
|
||||||
item.put("searchable", true);
|
|
||||||
item.put("selectMode", "tree");
|
|
||||||
item.put("searchResultMode", "list");
|
|
||||||
item.put("valueTpl", "${label}");
|
item.put("valueTpl", "${label}");
|
||||||
item.put("pickerSize", "lg");
|
item.put("pickerSize", "lg");
|
||||||
item.put("selectTitle", "可选项");
|
item.put("selectTitle", "可选项");
|
||||||
|
|||||||
@@ -563,7 +563,7 @@ class TemplateToAmisConverterTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void crud_用户选择框受控转tabsTransferPicker() {
|
void crud_用户选择框受控转UserTransferPicker() {
|
||||||
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
|
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
|
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
|
||||||
@@ -572,17 +572,13 @@ class TemplateToAmisConverterTest {
|
|||||||
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
||||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
Map<String, Object> picker = items.get(0);
|
Map<String, Object> picker = items.get(0);
|
||||||
assertEquals("tabs-transfer-picker", picker.get("type"));
|
assertEquals("user-transfer-picker", picker.get("type"));
|
||||||
assertEquals(Boolean.FALSE, picker.get("multiple"));
|
assertEquals(Boolean.FALSE, picker.get("multiple"));
|
||||||
assertEquals(Boolean.TRUE, picker.get("joinValues"));
|
assertEquals(Boolean.TRUE, picker.get("joinValues"));
|
||||||
assertEquals("/api/user-select/options?mode=controlled", picker.get("source"));
|
assertEquals("controlled", picker.get("mode"));
|
||||||
assertEquals("/api/user-select/search?mode=controlled&term=${term}", picker.get("searchApi"));
|
|
||||||
assertEquals(Boolean.TRUE, picker.get("searchable"));
|
|
||||||
assertEquals("tree", picker.get("selectMode"));
|
|
||||||
assertEquals("list", picker.get("searchResultMode"));
|
|
||||||
assertEquals("${label}", picker.get("valueTpl"));
|
assertEquals("${label}", picker.get("valueTpl"));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
|
||||||
&& n.contains("tabs-transfer-picker") && n.contains("controlled")));
|
&& n.contains("user-transfer-picker") && n.contains("controlled")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -600,12 +596,12 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
||||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
assertEquals("/api/user-select/options?mode=org", items.get(0).get("source"));
|
assertEquals("org", items.get(0).get("mode"));
|
||||||
assertEquals("/api/user-select/options?mode=attendance", items.get(1).get("source"));
|
assertEquals("attendance", items.get(1).get("mode"));
|
||||||
assertEquals("/api/user-select/options?mode=all", items.get(2).get("source"));
|
assertEquals("all", items.get(2).get("mode"));
|
||||||
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
|
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
|
||||||
assertEquals("tabs-transfer-picker", items.get(1).get("type"));
|
assertEquals("user-transfer-picker", items.get(1).get("type"));
|
||||||
assertEquals("tabs-transfer-picker", items.get(2).get("type"));
|
assertEquals("user-transfer-picker", items.get(2).get("type"));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=org")));
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=org")));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=attendance")));
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=attendance")));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=all")));
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=all")));
|
||||||
|
|||||||
@@ -79,14 +79,110 @@ public class UserSelectController {
|
|||||||
return okOptions(result);
|
return okOptions(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Map<String, Object>> listUsers(String mode, String q, int limit) {
|
@GetMapping("/bootstrap")
|
||||||
UserSource source = "attendance".equals(mode)
|
public Map<String, Object> bootstrap(@RequestParam(defaultValue = "controlled") String mode) {
|
||||||
? new UserSource("view_user_kq", "view_user_kq_id", false, true)
|
String normalizedMode = normalizeMode(mode);
|
||||||
: new UserSource("view_sys_user", "view_sys_user_id", true, false);
|
Map<String, Object> data = new LinkedHashMap<>();
|
||||||
|
data.put("departGroups", departGroupOptions());
|
||||||
|
data.put("positionTypes", positionTypeOptions(null, 500));
|
||||||
|
data.put("categories", categoryOptions(null, 500));
|
||||||
|
if ("org".equals(normalizedMode)) {
|
||||||
|
data.put("allUsers", List.of(option("全体人员", ALL_VALUE, "all")));
|
||||||
|
data.put("orgs", orgOptions(null, 500));
|
||||||
|
data.put("departs", departOptions(null, 1000));
|
||||||
|
}
|
||||||
|
return okData(data);
|
||||||
|
}
|
||||||
|
|
||||||
String labelExpr = source.hasDisplayName
|
@GetMapping("/group-users")
|
||||||
? "COALESCE(NULLIF(trim(u.displayname), ''), trim(u.name) || '[' || trim(u.account) || ']')"
|
public Map<String, Object> groupUsers(@RequestParam(defaultValue = "controlled") String mode,
|
||||||
: "trim(u.name) || '[' || trim(u.account) || ']'";
|
@RequestParam String group,
|
||||||
|
@RequestParam(name = "term", required = false) String term,
|
||||||
|
@RequestParam(name = "q", required = false) String q,
|
||||||
|
@RequestParam(defaultValue = "500") int limit) {
|
||||||
|
String normalizedMode = normalizeMode(mode);
|
||||||
|
String keyword = firstNonBlank(term, q);
|
||||||
|
int safeLimit = safeLimit(limit);
|
||||||
|
GroupKey key = parseGroup(group);
|
||||||
|
if (key == null) {
|
||||||
|
return okOptions(List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
String idColumn = userSource(normalizedMode).idColumn();
|
||||||
|
String condition;
|
||||||
|
List<Object> args = new ArrayList<>();
|
||||||
|
switch (key.kind()) {
|
||||||
|
case "org" -> {
|
||||||
|
condition = "u." + idColumn + " IN ("
|
||||||
|
+ "SELECT DISTINCT pu.userid FROM sys_position p "
|
||||||
|
+ "LEFT JOIN sys_positionuser pu ON p.sys_position_id = pu.positionid "
|
||||||
|
+ "WHERE p.parentdepartid IN (SELECT view_depart_id FROM view_depart_tree WHERE orgid = ?)"
|
||||||
|
+ ")";
|
||||||
|
args.add(key.id());
|
||||||
|
}
|
||||||
|
case "depart" -> {
|
||||||
|
condition = "u." + idColumn + " IN ("
|
||||||
|
+ "SELECT DISTINCT pu.userid FROM sys_position p "
|
||||||
|
+ "LEFT JOIN sys_positionuser pu ON p.sys_position_id = pu.positionid "
|
||||||
|
+ "WHERE p.parentdepartid IN ("
|
||||||
|
+ "SELECT view_depart_id FROM view_depart_tree WHERE ? = ANY(allparents) "
|
||||||
|
+ "UNION SELECT ?"
|
||||||
|
+ "))";
|
||||||
|
args.add(key.id());
|
||||||
|
args.add(key.id());
|
||||||
|
}
|
||||||
|
case "positionType" -> {
|
||||||
|
condition = "u." + idColumn + " IN ("
|
||||||
|
+ "SELECT DISTINCT pu.userid FROM sys_position p "
|
||||||
|
+ "LEFT JOIN sys_positionuser pu ON p.sys_position_id = pu.positionid "
|
||||||
|
+ "WHERE p.positiontype = ?"
|
||||||
|
+ ")";
|
||||||
|
args.add(key.id());
|
||||||
|
}
|
||||||
|
case "category" -> {
|
||||||
|
condition = "u." + idColumn + " IN ("
|
||||||
|
+ "SELECT DISTINCT cu.userid FROM sys_categoryuser cu WHERE cu.categoryid = ?"
|
||||||
|
+ ")";
|
||||||
|
args.add(key.id());
|
||||||
|
}
|
||||||
|
default -> {
|
||||||
|
return okOptions(List.of());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return okOptions(listUsers(normalizedMode, keyword, safeLimit, condition, args));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/resolve")
|
||||||
|
public Map<String, Object> resolve(@RequestParam(defaultValue = "controlled") String mode,
|
||||||
|
@RequestParam(defaultValue = "") String ids) {
|
||||||
|
String normalizedMode = normalizeMode(mode);
|
||||||
|
List<String> values = splitIds(ids);
|
||||||
|
if (values.isEmpty()) {
|
||||||
|
return okOptions(List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Map<String, Object>> result = new ArrayList<>();
|
||||||
|
if (values.stream().anyMatch(v -> "ALL".equalsIgnoreCase(v.trim()))) {
|
||||||
|
result.add(option("全体人员", ALL_VALUE, "all"));
|
||||||
|
}
|
||||||
|
result.addAll(userOptionsByIds(normalizedMode, values));
|
||||||
|
if ("org".equals(normalizedMode)) {
|
||||||
|
result.addAll(orgOptionsByIds(values));
|
||||||
|
result.addAll(departOptionsByIds(values));
|
||||||
|
result.addAll(positionTypeOptionsByIds(values));
|
||||||
|
}
|
||||||
|
return okOptions(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> listUsers(String mode, String q, int limit) {
|
||||||
|
return listUsers(mode, q, limit, null, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> listUsers(String mode, String q, int limit, String extraCondition,
|
||||||
|
List<Object> extraArgs) {
|
||||||
|
UserSource source = userSource(mode);
|
||||||
|
|
||||||
|
String labelExpr = userLabelExpr(source);
|
||||||
|
|
||||||
StringBuilder sql = new StringBuilder()
|
StringBuilder sql = new StringBuilder()
|
||||||
.append("SELECT trim(u.").append(source.idColumn).append(") AS value, ")
|
.append("SELECT trim(u.").append(source.idColumn).append(") AS value, ")
|
||||||
@@ -101,6 +197,10 @@ public class UserSelectController {
|
|||||||
sql.append("AND u.iscollected = 1 ");
|
sql.append("AND u.iscollected = 1 ");
|
||||||
}
|
}
|
||||||
appendKeywordFilter(sql, args, q, source.hasDisplayName);
|
appendKeywordFilter(sql, args, q, source.hasDisplayName);
|
||||||
|
if (extraCondition != null && !extraCondition.isBlank()) {
|
||||||
|
sql.append("AND (").append(extraCondition).append(") ");
|
||||||
|
args.addAll(extraArgs);
|
||||||
|
}
|
||||||
sql.append("ORDER BY u.account ASC LIMIT ?");
|
sql.append("ORDER BY u.account ASC LIMIT ?");
|
||||||
args.add(limit);
|
args.add(limit);
|
||||||
|
|
||||||
@@ -201,10 +301,7 @@ public class UserSelectController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<Map<String, Object>> categoryUserTree(List<Map<String, Object>> users) {
|
private List<Map<String, Object>> categoryUserTree(List<Map<String, Object>> users) {
|
||||||
List<Map<String, Object>> categories = jdbcTemplate.query(
|
List<Map<String, Object>> categories = categoryOptions(null, 500);
|
||||||
"SELECT trim(sys_category_id) AS value, trim(categoryname) AS label "
|
|
||||||
+ "FROM sys_category WHERE isactive = 1 ORDER BY categoryname",
|
|
||||||
optionMapper("category"));
|
|
||||||
if (categories.isEmpty()) {
|
if (categories.isEmpty()) {
|
||||||
return List.of();
|
return List.of();
|
||||||
}
|
}
|
||||||
@@ -244,6 +341,32 @@ public class UserSelectController {
|
|||||||
return nodes.values().stream().filter(n -> !children(n).isEmpty()).toList();
|
return nodes.values().stream().filter(n -> !children(n).isEmpty()).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> departGroupOptions() {
|
||||||
|
List<Map<String, Object>> items = new ArrayList<>();
|
||||||
|
for (Map<String, Object> org : orgOptions(null, 1000)) {
|
||||||
|
String id = String.valueOf(org.get("value"));
|
||||||
|
Map<String, Object> item = option("公司 / " + org.get("label"), "org:" + id, "org");
|
||||||
|
item.put("groupKind", "org");
|
||||||
|
item.put("groupId", id);
|
||||||
|
items.add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Map<String, Object>> departs = jdbcTemplate.query(
|
||||||
|
"SELECT trim(view_depart_id) AS value, path AS label "
|
||||||
|
+ "FROM view_depart_tree ORDER BY orgid, level, seq",
|
||||||
|
(rs, rowNum) -> {
|
||||||
|
String id = rs.getString("value");
|
||||||
|
String path = rs.getString("label");
|
||||||
|
Map<String, Object> item = option("部门 / " + normalizePathLabel(path),
|
||||||
|
"depart:" + id, "depart");
|
||||||
|
item.put("groupKind", "depart");
|
||||||
|
item.put("groupId", id);
|
||||||
|
return item;
|
||||||
|
});
|
||||||
|
items.addAll(departs);
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
private List<Map<String, Object>> orgOptions(String q, int limit) {
|
private List<Map<String, Object>> orgOptions(String q, int limit) {
|
||||||
StringBuilder sql = new StringBuilder("SELECT trim(sys_org_id) AS value, trim(name) AS label "
|
StringBuilder sql = new StringBuilder("SELECT trim(sys_org_id) AS value, trim(name) AS label "
|
||||||
+ "FROM sys_org WHERE isactive = 1 ");
|
+ "FROM sys_org WHERE isactive = 1 ");
|
||||||
@@ -275,6 +398,68 @@ public class UserSelectController {
|
|||||||
return jdbcTemplate.query(sql.toString(), optionMapper("positionType"), args.toArray());
|
return jdbcTemplate.query(sql.toString(), optionMapper("positionType"), args.toArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> categoryOptions(String q, int limit) {
|
||||||
|
StringBuilder sql = new StringBuilder("SELECT trim(sys_category_id) AS value, trim(categoryname) AS label "
|
||||||
|
+ "FROM sys_category WHERE isactive = 1 ");
|
||||||
|
List<Object> args = new ArrayList<>();
|
||||||
|
appendSimpleNameFilter(sql, args, q, "categoryname");
|
||||||
|
sql.append("ORDER BY categoryname LIMIT ?");
|
||||||
|
args.add(limit);
|
||||||
|
return jdbcTemplate.query(sql.toString(), optionMapper("category"), args.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> userOptionsByIds(String mode, List<String> ids) {
|
||||||
|
List<String> userIds = ids.stream()
|
||||||
|
.map(String::trim)
|
||||||
|
.filter(v -> !v.isBlank() && !"ALL".equalsIgnoreCase(v))
|
||||||
|
.toList();
|
||||||
|
if (userIds.isEmpty()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
|
||||||
|
UserSource source = userSource(mode);
|
||||||
|
String placeholders = placeholders(userIds.size());
|
||||||
|
String sql = "SELECT trim(u." + source.idColumn + ") AS value, "
|
||||||
|
+ userLabelExpr(source) + " AS label, "
|
||||||
|
+ "trim(u.account) AS account, trim(u.name) AS name, "
|
||||||
|
+ "trim(u.userorgid) AS userorgid, "
|
||||||
|
+ "trim(u.masterdepart) AS masterdepart, trim(u.masterposition) AS masterposition "
|
||||||
|
+ "FROM " + source.table + " u "
|
||||||
|
+ "WHERE trim(u." + source.idColumn + ") IN (" + placeholders + ")";
|
||||||
|
return jdbcTemplate.query(sql, (rs, rowNum) -> userOption(rs), userIds.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> orgOptionsByIds(List<String> ids) {
|
||||||
|
List<String> values = normalizedIds(ids);
|
||||||
|
if (values.isEmpty()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
String sql = "SELECT trim(sys_org_id) AS value, trim(name) AS label "
|
||||||
|
+ "FROM sys_org WHERE trim(sys_org_id) IN (" + placeholders(values.size()) + ")";
|
||||||
|
return jdbcTemplate.query(sql, optionMapper("org"), values.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> departOptionsByIds(List<String> ids) {
|
||||||
|
List<String> values = normalizedIds(ids);
|
||||||
|
if (values.isEmpty()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
String sql = "SELECT trim(view_depart_id) AS value, path AS label "
|
||||||
|
+ "FROM view_depart_tree WHERE trim(view_depart_id) IN (" + placeholders(values.size()) + ")";
|
||||||
|
return jdbcTemplate.query(sql, (rs, rowNum) ->
|
||||||
|
option(lastPathName(rs.getString("label")), rs.getString("value"), "depart"), values.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Map<String, Object>> positionTypeOptionsByIds(List<String> ids) {
|
||||||
|
List<String> values = normalizedIds(ids);
|
||||||
|
if (values.isEmpty()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
String sql = "SELECT trim(sys_positiontype_id) AS value, trim(name) AS label "
|
||||||
|
+ "FROM sys_positiontype WHERE trim(sys_positiontype_id) IN (" + placeholders(values.size()) + ")";
|
||||||
|
return jdbcTemplate.query(sql, optionMapper("positionType"), values.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
private boolean hasCollectedAttendanceRows() {
|
private boolean hasCollectedAttendanceRows() {
|
||||||
Number count = jdbcTemplate.queryForObject(
|
Number count = jdbcTemplate.queryForObject(
|
||||||
"SELECT count(*) FROM view_user_kq WHERE iscollected = 1", Number.class);
|
"SELECT count(*) FROM view_user_kq WHERE iscollected = 1", Number.class);
|
||||||
@@ -367,6 +552,10 @@ public class UserSelectController {
|
|||||||
data.put("options", options);
|
data.put("options", options);
|
||||||
data.put("items", options);
|
data.put("items", options);
|
||||||
data.put("total", options.size());
|
data.put("total", options.size());
|
||||||
|
return okData(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, Object> okData(Map<String, Object> data) {
|
||||||
Map<String, Object> resp = new LinkedHashMap<>();
|
Map<String, Object> resp = new LinkedHashMap<>();
|
||||||
resp.put("status", 0);
|
resp.put("status", 0);
|
||||||
resp.put("msg", "");
|
resp.put("msg", "");
|
||||||
@@ -426,6 +615,63 @@ public class UserSelectController {
|
|||||||
return idx >= 0 ? path.substring(idx + 1).trim() : path.trim();
|
return idx >= 0 ? path.substring(idx + 1).trim() : path.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String normalizePathLabel(String path) {
|
||||||
|
if (path == null || path.isBlank()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return path.replace(">", " / ").trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static UserSource userSource(String mode) {
|
||||||
|
return "attendance".equals(mode)
|
||||||
|
? new UserSource("view_user_kq", "view_user_kq_id", false, true)
|
||||||
|
: new UserSource("view_sys_user", "view_sys_user_id", true, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String userLabelExpr(UserSource source) {
|
||||||
|
return source.hasDisplayName
|
||||||
|
? "COALESCE(NULLIF(trim(u.displayname), ''), trim(u.name) || '[' || trim(u.account) || ']')"
|
||||||
|
: "trim(u.name) || '[' || trim(u.account) || ']'";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static GroupKey parseGroup(String group) {
|
||||||
|
if (group == null || group.isBlank()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
String[] parts = group.split(":", 2);
|
||||||
|
if (parts.length != 2 || parts[0].isBlank() || parts[1].isBlank()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return new GroupKey(parts[0].trim(), parts[1].trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<String> splitIds(String ids) {
|
||||||
|
if (ids == null || ids.isBlank()) {
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
List<String> values = new ArrayList<>();
|
||||||
|
for (String id : ids.split(",")) {
|
||||||
|
if (id != null && !id.isBlank()) {
|
||||||
|
values.add(id.trim());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<String> normalizedIds(List<String> ids) {
|
||||||
|
return ids.stream()
|
||||||
|
.map(String::trim)
|
||||||
|
.filter(v -> !v.isBlank() && !"ALL".equalsIgnoreCase(v))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String placeholders(int size) {
|
||||||
|
return String.join(",", java.util.Collections.nCopies(size, "?"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private record GroupKey(String kind, String id) {
|
||||||
|
}
|
||||||
|
|
||||||
private record UserSource(String table, String idColumn, boolean hasDisplayName, boolean attendance) {
|
private record UserSource(String table, String idColumn, boolean hasDisplayName, boolean attendance) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user