versions = new LinkedHashMap<>();
+ versions.put(ApprovalConstants.FLOW_COMPLETION, 1);
+ versions.put(ApprovalConstants.FLOW_COORDINATION_INTERNAL, 2);
+ LATEST_VERSIONS = Collections.unmodifiableMap(versions);
+ }
@Resource
private ApprovalFlowDefinitionMapper flowDefinitionMapper;
@@ -31,18 +45,19 @@ public class ApprovalFlowService {
private ObjectMapper objectMapper;
/**
- * 获取租户下的流程定义；不存在时创建 version=1。
+ * 获取租户下流程定义的最新版本；尚无该版本时发布新版。
*
- * 并发首次创建依赖唯一键 uk_flow_ver 兜底，冲突后重新查询。
+ * 并发首次创建依赖唯一键 uk_flow_ver 兜底，冲突后重新读取最新版本。
*/
public ApprovalFlowDefinition getOrCreate(String flowCode) {
- ApprovalFlowDefinition definition = find(flowCode);
- if (definition != null) {
+ int latestVersion = latestVersion(flowCode);
+ ApprovalFlowDefinition definition = findLatest(flowCode);
+ if (definition != null && definition.getVersion() >= latestVersion) {
return definition;
}
ApprovalFlowDefinition created = new ApprovalFlowDefinition();
created.setFlowCode(flowCode);
- created.setVersion(INITIAL_VERSION);
+ created.setVersion(latestVersion);
created.setName(flowName(flowCode));
created.setNodesJson(flowNodesJson(flowCode));
try {
@@ -50,8 +65,8 @@ public class ApprovalFlowService {
return created;
} catch (DuplicateKeyException e) {
log.info("审批流程定义已被并发创建，重新读取: {}", flowCode);
- definition = find(flowCode);
- if (definition == null) {
+ definition = findLatest(flowCode);
+ if (definition == null || definition.getVersion() < latestVersion) {
throw new BusinessException("审批流程定义初始化失败");
}
return definition;
@@ -92,13 +107,18 @@ public class ApprovalFlowService {
return node == null ? null : node.getName();
}
- private ApprovalFlowDefinition find(String flowCode) {
+ private ApprovalFlowDefinition findLatest(String flowCode) {
return flowDefinitionMapper.selectOne(new LambdaQueryWrapper()
.eq(ApprovalFlowDefinition::getFlowCode, flowCode)
- .eq(ApprovalFlowDefinition::getVersion, INITIAL_VERSION)
+ .orderByDesc(ApprovalFlowDefinition::getVersion)
.last("LIMIT 1"));
}
+ private int latestVersion(String flowCode) {
+ Integer version = LATEST_VERSIONS.get(flowCode);
+ return version == null ? INITIAL_VERSION : version;
+ }
+
private String flowName(String flowCode) {
if (ApprovalConstants.FLOW_COMPLETION.equals(flowCode)) {
return "业务完成确认单";
diff --git a/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java b/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
index 7868be4..0c58f4f 100644
--- a/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
+++ b/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
@@ -27,6 +27,7 @@ import com.gxwebsoft.approval.vo.ApprovalInstanceVO;
import com.gxwebsoft.approval.vo.ApprovalItemVO;
import com.gxwebsoft.approval.vo.ApprovalMyTaskVO;
import com.gxwebsoft.approval.vo.ApprovalOrganizationVO;
+import com.gxwebsoft.approval.vo.ApprovalPendingTaskVO;
import com.gxwebsoft.approval.vo.ApprovalPermissionsVO;
import com.gxwebsoft.approval.vo.ApprovalRecordVO;
import com.gxwebsoft.approval.vo.ApprovalUserVO;
@@ -34,6 +35,7 @@ import com.gxwebsoft.common.core.exception.BusinessException;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.system.entity.Menu;
import com.gxwebsoft.common.system.entity.User;
+import org.springframework.security.access.AccessDeniedException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -59,7 +61,9 @@ import java.util.stream.Collectors;
public class ApprovalInstanceService {
private static final BigDecimal MAX_FEE = new BigDecimal("99999999.99");
- private static final String PERMISSION_ASSIGN = "approval:instance:assign";
+ private static final String PERMISSION_ASSIGN = ApprovalConstants.PERMISSION_ASSIGN;
+ /** 待办范围：全租户待办（仅 assign 权限可用）。 */
+ private static final String SCOPE_ALL = "all";
@Resource
private ApprovalInstanceMapper instanceMapper;
@@ -103,7 +107,7 @@ public class ApprovalInstanceService {
/**
* 新建或更新内部协调单草稿，返回实例id。
*
- * 报送部门与经办人取登录态；受理部门必须是启用组织，保存时即校验。
+ * 报送部门与报送人取登录态；受理部门必须是启用组织，保存时即校验。
*/
public Long saveCoordination(ApprovalCoordinationParam param, User user) {
validateCoordination(param);
@@ -233,7 +237,7 @@ public class ApprovalInstanceService {
}
/**
- * 详情；草稿仅发起人可见，其余按任务/记录/派单目标或 allVisible 角色判断。
+ * 详情；草稿仅报送人可见，其余按任务/记录/派单目标或 allVisible 角色判断。
*/
public ApprovalInstanceVO detail(Long instanceId, User user) {
ApprovalInstance instance = instanceMapper.selectById(instanceId);
@@ -242,7 +246,9 @@ public class ApprovalInstanceService {
}
int allVisible = directoryService.hasAnyRole(user.getUserId(),
ApprovalConstants.ROLE_SUPER_ADMIN, ApprovalConstants.ROLE_ARCHIVIST) ? 1 : 0;
- if (instanceMapper.countVisible(instanceId, user.getUserId(), allVisible) == 0) {
+ int assignVisible = hasAuthority(user, PERMISSION_ASSIGN)
+ && ApprovalConstants.STATUS_PENDING.equals(instance.getStatus()) ? 1 : 0;
+ if (instanceMapper.countVisible(instanceId, user.getUserId(), allVisible, assignVisible) == 0) {
throw new BusinessException("无权查看该单据");
}
@@ -267,6 +273,7 @@ public class ApprovalInstanceService {
vo.setConfirms(confirms(instance));
ApprovalMyTaskVO myTask = myTask(instance, user.getUserId());
vo.setMyTask(myTask);
+ vo.setPendingTasks(pendingTasks(instance));
vo.setPermissions(permissions(instance, user, myTask));
return vo;
}
@@ -284,8 +291,17 @@ public class ApprovalInstanceService {
/**
* 我的待办：本人 PENDING 任务对应的实例，按实例去重。
+ *
+ * PC 传 {@code scope=all} 时返回全租户待办，仅 assign 权限可用；
+ * 员工端不传 scope，行为不变。
*/
public PageResult todo(ApprovalTaskListParam param, User user) {
+ if (SCOPE_ALL.equals(param.getScope())) {
+ if (!hasAuthority(user, PERMISSION_ASSIGN)) {
+ throw new AccessDeniedException("无权限查看全部待办");
+ }
+ return pendingPage(param);
+ }
return taskPage(param, user, ApprovalConstants.TASK_PENDING);
}
@@ -296,6 +312,17 @@ public class ApprovalInstanceService {
return taskPage(param, user, ApprovalConstants.TASK_DONE);
}
+ /**
+ * 全租户待办：任一 PENDING 任务对应的实例，按实例去重。
+ */
+ private PageResult pendingPage(ApprovalTaskListParam param) {
+ long current = param.getPage() == null ? 1 : Math.max(1, param.getPage());
+ long size = param.getLimit() == null ? 10 : Math.max(1, param.getLimit());
+ Page page = new Page<>(current, size);
+ List rows = taskMapper.selectPendingInstancePage(page, param);
+ return new PageResult<>(toItems(rows), page.getTotal());
+ }
+
private PageResult taskPage(ApprovalTaskListParam param, User user, String taskStatus) {
long current = param.getPage() == null ? 1 : Math.max(1, param.getPage());
long size = param.getLimit() == null ? 10 : Math.max(1, param.getLimit());
@@ -552,6 +579,28 @@ public class ApprovalInstanceService {
return vo;
}
+ private List pendingTasks(ApprovalInstance instance) {
+ if (!ApprovalConstants.STATUS_PENDING.equals(instance.getStatus())) {
+ return new ArrayList<>();
+ }
+ List tasks = taskMapper.selectList(new LambdaQueryWrapper()
+ .eq(ApprovalTask::getInstanceId, instance.getId())
+ .eq(ApprovalTask::getStatus, ApprovalConstants.TASK_PENDING)
+ .orderByAsc(ApprovalTask::getId));
+ List result = new ArrayList<>(tasks.size());
+ for (ApprovalTask task : tasks) {
+ ApprovalPendingTaskVO vo = new ApprovalPendingTaskVO();
+ vo.setId(task.getId());
+ vo.setNodeKey(task.getNodeKey());
+ vo.setNodeName(flowService.nodeName(instance.getDefinitionId(), task.getNodeKey()));
+ vo.setNodeType(task.getNodeType());
+ vo.setAssigneeId(task.getAssigneeId());
+ vo.setAssigneeName(task.getAssigneeName());
+ result.add(vo);
+ }
+ return result;
+ }
+
private ApprovalPermissionsVO permissions(ApprovalInstance instance, User user, ApprovalMyTaskVO myTask) {
ApprovalPermissionsVO permissions = new ApprovalPermissionsVO();
boolean reporter = instance.getReporterId().equals(user.getUserId());
@@ -565,6 +614,8 @@ public class ApprovalInstanceService {
.eq(ApprovalTask::getStatus, ApprovalConstants.TASK_DONE));
permissions.setCanWithdraw(done == null || done == 0);
}
+ permissions.setCanAssign(hasAuthority(user, PERMISSION_ASSIGN)
+ && ApprovalConstants.STATUS_PENDING.equals(instance.getStatus()));
if (myTask != null) {
boolean approveNode = ApprovalConstants.NODE_APPROVE.equals(myTask.getNodeType());
boolean rejectableNode = approveNode || ApprovalConstants.NODE_DISPATCH.equals(myTask.getNodeType());
@@ -573,7 +624,6 @@ public class ApprovalInstanceService {
permissions.setCanDispatch(ApprovalConstants.NODE_DISPATCH.equals(myTask.getNodeType()));
permissions.setCanConfirm(ApprovalConstants.NODE_CONFIRM.equals(myTask.getNodeType()));
permissions.setCanArchive(ApprovalConstants.NODE_ARCHIVE.equals(myTask.getNodeType()));
- permissions.setCanAssign(hasAuthority(user, PERMISSION_ASSIGN));
}
return permissions;
}
diff --git a/src/main/java/com/gxwebsoft/approval/service/ApprovalQueryService.java b/src/main/java/com/gxwebsoft/approval/service/ApprovalQueryService.java
index 1ab4609..53a310e 100644
--- a/src/main/java/com/gxwebsoft/approval/service/ApprovalQueryService.java
+++ b/src/main/java/com/gxwebsoft/approval/service/ApprovalQueryService.java
@@ -8,6 +8,7 @@ import com.gxwebsoft.approval.support.ApprovalItemRow;
import com.gxwebsoft.approval.support.ApprovalNode;
import com.gxwebsoft.approval.vo.ApprovalItemVO;
import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Menu;
import com.gxwebsoft.common.system.entity.User;
import org.springframework.stereotype.Service;
@@ -44,8 +45,10 @@ public class ApprovalQueryService {
long size = param.getLimit() == null ? DEFAULT_LIMIT : Math.max(1, param.getLimit());
int allVisible = directoryService.hasAnyRole(user.getUserId(),
ApprovalConstants.ROLE_SUPER_ADMIN, ApprovalConstants.ROLE_ARCHIVIST) ? 1 : 0;
+ int assignVisible = hasAuthority(user, ApprovalConstants.PERMISSION_ASSIGN) ? 1 : 0;
Page page = new Page<>(current, size);
- List rows = queryMapper.selectInstancePage(page, param, user.getUserId(), allVisible);
+ List rows = queryMapper.selectInstancePage(page, param, user.getUserId(), allVisible,
+ assignVisible);
Map> nodeCache = new HashMap<>();
List list = new ArrayList<>(rows.size());
for (ApprovalItemRow row : rows) {
@@ -73,6 +76,15 @@ public class ApprovalQueryService {
return item;
}
+ private boolean hasAuthority(User user, String authority) {
+ if (user.getAuthorities() == null) {
+ return false;
+ }
+ return user.getAuthorities().stream()
+ .map(Menu::getAuthority)
+ .anyMatch(authority::equals);
+ }
+
private String nodeName(Map> cache, Long definitionId, String nodeKey) {
if (definitionId == null || nodeKey == null) {
return null;
diff --git a/src/main/java/com/gxwebsoft/approval/vo/ApprovalInstanceVO.java b/src/main/java/com/gxwebsoft/approval/vo/ApprovalInstanceVO.java
index 55235d2..deb6a9d 100644
--- a/src/main/java/com/gxwebsoft/approval/vo/ApprovalInstanceVO.java
+++ b/src/main/java/com/gxwebsoft/approval/vo/ApprovalInstanceVO.java
@@ -88,5 +88,8 @@ public class ApprovalInstanceVO implements Serializable {
private ApprovalMyTaskVO myTask;
+ /** 实例当前全部待办任务，供有 assign 权限的 PC 用户按任务改派。 */
+ private List pendingTasks;
+
private ApprovalPermissionsVO permissions;
}
diff --git a/src/main/java/com/gxwebsoft/approval/vo/ApprovalPendingTaskVO.java b/src/main/java/com/gxwebsoft/approval/vo/ApprovalPendingTaskVO.java
new file mode 100644
index 0000000..0435752
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/approval/vo/ApprovalPendingTaskVO.java
@@ -0,0 +1,27 @@
+package com.gxwebsoft.approval.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 实例上的待办任务（PC 改派按任务 id 操作）。
+ */
+@Data
+@ApiModel(description = "实例待办任务")
+public class ApprovalPendingTaskVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+
+ private String nodeKey;
+
+ private String nodeName;
+
+ private String nodeType;
+
+ private Integer assigneeId;
+
+ private String assigneeName;
+}
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
index 867c788..78e354a 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
@@ -120,17 +120,22 @@ class ApprovalCoordinationIT {
.andExpect(jsonPath("$.data.list[0].acceptOrgName").isNotEmpty())
.andExpect(jsonPath("$.data.list[0].statusName").value("未提交"));
- // 流程定义按租户幂等，节点顺序固定；一期不产生外部协调流程
- assertThat(data.countMaster("SELECT COUNT(*) FROM approval_flow_definition "
- + "WHERE tenant_id = ? AND flow_code = 'coordination_internal' AND version = 1", TENANT)).isEqualTo(1);
+ // 流程定义按租户幂等发布最新版本，节点顺序固定；v1 保留不改，v2 派单归受理部门负责人
+ assertThat(data.queryMaster("SELECT MAX(version) FROM approval_flow_definition "
+ + "WHERE tenant_id = ? AND flow_code = 'coordination_internal'", Integer.class, TENANT)).isEqualTo(2);
String nodes = data.queryMaster("SELECT nodes_json FROM approval_flow_definition "
- + "WHERE tenant_id = ? AND flow_code = 'coordination_internal' AND version = 1", String.class, TENANT);
+ + "WHERE tenant_id = ? AND flow_code = 'coordination_internal' "
+ + "ORDER BY version DESC LIMIT 1", String.class, TENANT);
assertThat(nodes).contains("reportLeader").contains("acceptLeader").contains("dispatch")
.contains("confirm").contains("archive");
+ assertThat(nodes).contains("\"type\": \"DISPATCH\", \"resolver\": \"acceptOrgLeader\"");
+ // 实例固定引用创建时的定义版本（v2）
+ assertThat(data.queryMaster("SELECT definition_version FROM approval_instance WHERE id = ?",
+ Integer.class, instanceId)).isEqualTo(2);
assertThat(data.countMaster("SELECT COUNT(*) FROM approval_flow_definition "
+ "WHERE tenant_id = ? AND flow_code = 'coordination_external'", TENANT)).isZero();
- // 报送部门与经办人只取登录态，客户端伪造字段被忽略
+ // 报送部门与报送人只取登录态，客户端伪造字段被忽略
ApprovalTestData.TestUser other = data.createUser("他人" + data.uniqueSuffix(), acceptOrgId);
String forged = "{\"acceptOrgId\":" + acceptOrgId + ",\"title\":\"伪造部门\",\"content\":\"内容\","
+ "\"reporterId\":" + other.userId + ",\"reportOrgId\":" + acceptOrgId + "}";
@@ -350,7 +355,10 @@ class ApprovalCoordinationIT {
String.class, instanceId)).isEqualTo("dispatch");
assertThat(data.queryMaster("SELECT current_node_type FROM approval_instance WHERE id = ?",
String.class, instanceId)).isEqualTo("DISPATCH");
- assertThat(pendingTaskIds(instanceId)).contains(acceptMember.userId);
+ // 派单节点只分配给受理部门负责人，普通部门成员无派单待办
+ assertThat(pendingTaskIds(instanceId)).containsExactly(acceptLeader.userId);
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND assignee_id = ? AND node_type = 'DISPATCH'", instanceId, acceptMember.userId)).isZero();
assertThat(data.countMaster("SELECT COUNT(*) FROM approval_record WHERE instance_id = ? "
+ "AND action = 'APPROVE'", instanceId)).isEqualTo(2);
assertThat(data.queryMaster("SELECT opinion FROM approval_task WHERE id = ?", String.class, reportTask))
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
index 139a9ec..4930675 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
@@ -122,6 +122,12 @@ class ApprovalDispatchIT {
long instanceId = reachDispatch("部门候选池");
long dispatchTask = pendingTaskId(instanceId, acceptLeader.userId);
+ // 派单节点只落在受理部门负责人（或签），普通部门成员不产生派单待办
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND node_type = 'DISPATCH'", instanceId)).isEqualTo(1);
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND assignee_id = ? AND node_type = 'DISPATCH'", instanceId, acceptMember.userId)).isZero();
+
// 部门内停用成员不进入候选池
ApprovalTestData.TestUser disabled =
data.createUser("派单停用成员" + data.uniqueSuffix(), acceptOrgId, TENANT);
@@ -158,6 +164,11 @@ class ApprovalDispatchIT {
// 受理部门成员全部调离后部门为空，派单待办仍在负责人手中
data.setUserOrganization(acceptLeader.userId, reportOrgId);
data.setUserOrganization(acceptMember.userId, reportOrgId);
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND assignee_id = ? AND node_type = 'DISPATCH' AND status = 'PENDING'",
+ instanceId, acceptLeader.userId)).isEqualTo(1);
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND assignee_id = ? AND node_type = 'DISPATCH'", instanceId, acceptMember.userId)).isZero();
String response = mockMvc.perform(authed(get("/api/approval/task/" + dispatchTask + "/candidates"),
acceptLeader, reportOrgId, APPROVE))
@@ -179,7 +190,6 @@ class ApprovalDispatchIT {
void dispatchesToSelectedCandidateAndCreatesBothConfirmTasks() throws Exception {
long instanceId = reachDispatch("派单存档");
long dispatchTask = pendingTaskId(instanceId, acceptLeader.userId);
- long otherDispatchTask = pendingTaskId(instanceId, acceptMember.userId);
mockMvc.perform(authed(post("/api/approval/task/" + dispatchTask + "/dispatch"),
acceptLeader, acceptOrgId, APPROVE)
@@ -193,13 +203,13 @@ class ApprovalDispatchIT {
.andExpect(jsonPath("$.data.dispatchTargetName").value(acceptMember.realName))
.andExpect(jsonPath("$.data.myTask").doesNotExist());
- // 派单任务完成并快照派单对象，同节点其余派单待办取消
+ // 派单任务完成并快照派单对象；派单节点只有负责人的一条或签待办
assertThat(data.queryMaster("SELECT status FROM approval_task WHERE id = ?", String.class, dispatchTask))
.isEqualTo("DONE");
assertThat(data.queryMaster("SELECT dispatch_target_id FROM approval_task WHERE id = ?",
Integer.class, dispatchTask)).isEqualTo(acceptMember.userId);
- assertThat(data.queryMaster("SELECT status FROM approval_task WHERE id = ?", String.class, otherDispatchTask))
- .isEqualTo("CANCELLED");
+ assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ + "AND node_type = 'DISPATCH'", instanceId)).isEqualTo(1);
assertThat(data.queryMaster("SELECT dispatch_target_id FROM approval_instance WHERE id = ?",
Integer.class, instanceId)).isEqualTo(acceptMember.userId);
assertThat(data.queryMaster("SELECT dispatch_target_name FROM approval_instance WHERE id = ?",
@@ -273,7 +283,6 @@ class ApprovalDispatchIT {
void concurrentDispatchOnlySucceedsOnce() throws Exception {
long instanceId = reachDispatch("并发派单");
long leaderTask = pendingTaskId(instanceId, acceptLeader.userId);
- long memberTask = pendingTaskId(instanceId, acceptMember.userId);
CountDownLatch start = new CountDownLatch(1);
CountDownLatch done = new CountDownLatch(2);
@@ -283,7 +292,7 @@ class ApprovalDispatchIT {
try {
dispatchAsync(executor, start, done, leaderTask, acceptLeader, acceptOrgId,
acceptMember.userId, success, conflict);
- dispatchAsync(executor, start, done, memberTask, acceptMember, acceptOrgId,
+ dispatchAsync(executor, start, done, leaderTask, acceptLeader, acceptOrgId,
acceptLeader.userId, success, conflict);
start.countDown();
assertThat(done.await(30, TimeUnit.SECONDS)).isTrue();
@@ -298,7 +307,7 @@ class ApprovalDispatchIT {
assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ "AND node_type = 'DISPATCH' AND status = 'DONE'", instanceId)).isEqualTo(1);
assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
- + "AND node_type = 'DISPATCH' AND status = 'CANCELLED'", instanceId)).isEqualTo(1);
+ + "AND node_type = 'DISPATCH'", instanceId)).isEqualTo(1);
assertThat(data.countMaster("SELECT COUNT(*) FROM approval_task WHERE instance_id = ? "
+ "AND node_type = 'CONFIRM' AND status = 'PENDING'", instanceId)).isEqualTo(2);
}
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
index d29ddcc..e9d8aea 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
@@ -139,7 +139,7 @@ class ApprovalExportIT {
mockMvc.perform(authed(post(URL), reporter, LIST, EXPORT)
.contentType(MediaType.APPLICATION_JSON)
- .content("{\"keyword\":" + quote(mark) + "}"))
+ .content("{\"keywords\":" + quote(mark) + "}"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(1))
.andExpect(jsonPath("$.message").value(org.hamcrest.Matchers.containsString("请缩小筛选范围")));
@@ -164,7 +164,7 @@ class ApprovalExportIT {
String response = mockMvc.perform(authed(post(URL), reporter, LIST, EXPORT)
.contentType(MediaType.APPLICATION_JSON)
- .content("{\"keyword\":" + quote(mark) + "}"))
+ .content("{\"keywords\":" + quote(mark) + "}"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(0))
.andReturn().getResponse().getContentAsString(StandardCharsets.UTF_8);
@@ -244,7 +244,7 @@ class ApprovalExportIT {
mockMvc.perform(authed(post(URL), reporter, LIST, EXPORT)
.contentType(MediaType.APPLICATION_JSON)
- .content("{\"keyword\":" + quote(mark) + "}"))
+ .content("{\"keywords\":" + quote(mark) + "}"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(0))
.andExpect(jsonPath("$.message").value(org.hamcrest.Matchers.containsString("共2条")));
@@ -281,10 +281,10 @@ class ApprovalExportIT {
return null;
}
- private List exportBizNos(ApprovalTestData.TestUser user, String keyword) throws Exception {
+ private List exportBizNos(ApprovalTestData.TestUser user, String keywords) throws Exception {
String response = mockMvc.perform(authed(post(URL), user, LIST, EXPORT)
.contentType(MediaType.APPLICATION_JSON)
- .content("{\"keyword\":" + quote(keyword) + "}"))
+ .content("{\"keywords\":" + quote(keywords) + "}"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(0))
.andReturn().getResponse().getContentAsString(StandardCharsets.UTF_8);
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
index 26e43fd..8ca1e2d 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
@@ -142,6 +142,54 @@ class ApprovalPcTodoIT {
.andExpect(jsonPath("$.message").value(org.hamcrest.Matchers.containsString("无权处理该任务")));
}
+ @Test
+ void listsAllTenantPendingTasksForAssignUserAndReassignsOthers() throws Exception {
+ String title = "全租户待办" + data.uniqueSuffix();
+ long instanceId = createAndSubmit(title);
+ long taskId = pendingTaskId(instanceId, leader.userId);
+
+ // 有 assign 权限的 PC 用户通过 scope=all 看到他人待办
+ mockMvc.perform(authed(get("/api/approval/todo/page").param("scope", "all")
+ .param("keywords", title), admin, organizationId, LIST, ASSIGN))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value(0))
+ .andExpect(jsonPath("$.data.count").value(1))
+ .andExpect(jsonPath("$.data.list[0].id").value((int) instanceId));
+
+ // 非处理人也能打开详情，并按任务 id 拿到待办任务与改派权限
+ mockMvc.perform(authed(get("/api/approval/instance/" + instanceId), admin, organizationId, LIST, ASSIGN))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value(0))
+ .andExpect(jsonPath("$.data.permissions.canAssign").value(true))
+ .andExpect(jsonPath("$.data.myTask").doesNotExist())
+ .andExpect(jsonPath("$.data.pendingTasks.length()").value(1))
+ .andExpect(jsonPath("$.data.pendingTasks[0].id").value((int) taskId))
+ .andExpect(jsonPath("$.data.pendingTasks[0].assigneeId").value(leader.userId))
+ .andExpect(jsonPath("$.data.pendingTasks[0].nodeName").value("报送部门负责人"));
+
+ // 按待办任务 id 改派成功，待办转移到新处理人
+ ApprovalTestData.TestUser target = data.createUser("全租户改派目标" + data.uniqueSuffix(), organizationId);
+ mockMvc.perform(assign(taskId, admin, ASSIGN, target.userId, "全租户改派" + data.uniqueSuffix()))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value(0))
+ .andExpect(jsonPath("$.data.assigneeId").value(target.userId));
+ mockMvc.perform(authed(get("/api/approval/todo/page"), leader, organizationId, LIST))
+ .andExpect(jsonPath("$.data.count").value(0));
+ mockMvc.perform(authed(get("/api/approval/todo/page"), target, organizationId, LIST))
+ .andExpect(jsonPath("$.data.count").value(1))
+ .andExpect(jsonPath("$.data.list[0].id").value((int) instanceId));
+ }
+
+ @Test
+ void rejectsScopeAllWithoutAssignAuthority() throws Exception {
+ long instanceId = createAndSubmit("全租户越权" + data.uniqueSuffix());
+ assertThat(instanceId).isPositive();
+
+ mockMvc.perform(authed(get("/api/approval/todo/page").param("scope", "all"), admin, organizationId, LIST))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value(403));
+ }
+
@Test
void rejectsAssignToUnknownOrInactiveUser() throws Exception {
long instanceId = createAndSubmit("改派无效目标");
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
index 37c38ef..31f2d62 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
@@ -81,25 +81,25 @@ class ApprovalQueryIT {
long draft = createCompletionDraft("场馆维护草稿", "广西体育中心保障部");
// 单据类型 + 关键词命中实施单位
- assertThat(queryIds("?docType=completion&keyword=实施部")).containsExactly(submitted);
+ assertThat(queryIds("?docType=completion&keywords=实施部")).containsExactly(submitted);
// 关键词命中协调单标题
- assertThat(queryIds("?docType=coordination&keyword=维修协调")).containsExactly(coordination);
+ assertThat(queryIds("?docType=coordination&keywords=维修协调")).containsExactly(coordination);
// 关键词命中单号
String bizNo = data.queryMaster("SELECT biz_no FROM approval_instance WHERE id = ?", String.class, submitted);
- assertThat(queryIds("?keyword=" + bizNo)).containsExactly(submitted);
+ assertThat(queryIds("?keywords=" + bizNo)).containsExactly(submitted);
// 报送部门：两类单据都按报送部门过滤，其它部门不命中
assertThat(queryIds("?reportOrgId=" + reportOrgId))
.containsExactlyInAnyOrder(submitted, coordination, draft);
assertThat(queryIds("?reportOrgId=" + acceptOrgId)).isEmpty();
// 受理部门
assertThat(queryIds("?acceptOrgId=" + acceptOrgId)).containsExactly(coordination);
- // 发起人
+ // 报送人
assertThat(queryIds("?reporterId=" + reporter.userId)).containsExactlyInAnyOrder(submitted, coordination, draft);
// 状态
assertThat(queryIds("?status=PENDING")).containsExactlyInAnyOrder(submitted, coordination);
assertThat(queryIds("?status=DRAFT")).containsExactly(draft);
// 总数与分页总数一致
- assertThat(queryCount("?keyword=实施部")).isEqualTo(1);
+ assertThat(queryCount("?keywords=实施部")).isEqualTo(1);
// 单号精确筛选
assertThat(queryIds("?bizNo=" + bizNo)).containsExactly(submitted);
// 提交时间范围
@@ -142,7 +142,7 @@ class ApprovalQueryIT {
@Test
void limitsListByDataPermission() throws Exception {
- long draft = createCompletionDraft("仅发起人可见草稿");
+ long draft = createCompletionDraft("仅报送人可见草稿");
long pending = seedCoordination("待处理协调单", "PENDING", LocalDateTime.now().minusHours(1), null);
ApprovalTestData.TestUser outsider = data.createUser("无关人员" + data.uniqueSuffix(), acceptOrgId);
@@ -161,7 +161,7 @@ class ApprovalQueryIT {
ApprovalTestData.TestRole archivistRole = data.createRole(ApprovalConstants.ROLE_ARCHIVIST, "收文员");
data.bind(archivist.userId, archivistRole.roleId);
- // 发起人可见自己的草稿与在途单据
+ // 报送人可见自己的草稿与在途单据
assertThat(queryIdsAs(reporter, "")).containsExactlyInAnyOrder(draft, pending);
// 参与人：有任务、有处理记录、被派单
assertThat(queryIdsAs(assignee, "")).containsExactly(pending);
@@ -170,7 +170,7 @@ class ApprovalQueryIT {
// 无关人员看不到他人单据
assertThat(queryIdsAs(outsider, "")).isEmpty();
assertThat(queryIdsAs(outsider, "?status=PENDING")).isEmpty();
- // 收文员看全租户，但草稿仍只属于发起人
+ // 收文员看全租户，但草稿仍只属于报送人
assertThat(queryIdsAs(archivist, "")).contains(pending).doesNotContain(draft);
assertThat(queryIdsAs(archivist, "?status=DRAFT")).isEmpty();
}
From 564122295ed39cac329508c0f8e38c3896fae6dd Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sat, 31 Oct 2026 01:21:12 +0800
Subject: [PATCH 14/18] =?UTF-8?q?chore:=20SQL=20=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E5=8A=A0=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=E5=89=8D=E7=BC=80?=
=?UTF-8?q?=EF=BC=8801-=E8=A1=A8=E7=BB=93=E6=9E=84=E3=80=8102-=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/{approval.sql => 01-approval.sql} | 0
sql/{approval_menu.sql => 02-approval_menu.sql} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename sql/{approval.sql => 01-approval.sql} (100%)
rename sql/{approval_menu.sql => 02-approval_menu.sql} (100%)
diff --git a/sql/approval.sql b/sql/01-approval.sql
similarity index 100%
rename from sql/approval.sql
rename to sql/01-approval.sql
diff --git a/sql/approval_menu.sql b/sql/02-approval_menu.sql
similarity index 100%
rename from sql/approval_menu.sql
rename to sql/02-approval_menu.sql
From 5f7bead9d969c13e02cd9d5e1050bb5b9f1c7eca Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sat, 31 Oct 2026 01:32:36 +0800
Subject: [PATCH 15/18] =?UTF-8?q?feat:=20=E4=B9=9D=E7=B1=BB=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E9=83=A8=E9=97=A8=E4=B8=8E=E5=B2=97=E4=BD=8D=E8=A7=92?=
=?UTF-8?q?=E8=89=B2=E7=A7=8D=E5=AD=90=20SQL=EF=BC=8803=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/03-approval_orgs_roles.sql | 190 +++++++++++++++++++++++++++++++++
1 file changed, 190 insertions(+)
create mode 100644 sql/03-approval_orgs_roles.sql
diff --git a/sql/03-approval_orgs_roles.sql b/sql/03-approval_orgs_roles.sql
new file mode 100644
index 0000000..8f58cc3
--- /dev/null
+++ b/sql/03-approval_orgs_roles.sql
@@ -0,0 +1,190 @@
+-- 审批组织与岗位角色种子（可重复执行）
+-- 目标库：gxtyzx_core（server）
+-- 执行顺序：01-approval.sql -> 02-approval_menu.sql -> 03-approval_orgs_roles.sql
+--
+-- 覆盖 0630 九类线下审批涉及的部门与岗位：
+-- 部门：场馆部（已存在则复用）、运营管理部、安全运保部、财务部
+-- 部门岗位：dept_leader_（负责人）、dept_deputy_（分管领导）
+-- 租户岗位：approval_archivist（收文员）、approval_general_manager（总经理/主要领导）、
+-- approval_cashier（出纳）、approval_typist（录入员）、approval_issuer（发放人）
+--
+-- 只建部门与空角色，不写成员、不授予菜单权限；成员与授权由客户在后台分配。
+-- 按 tenant_id=10150 执行；换租户时改下面的 @tenant_id。
+
+SET @tenant_id := 10150;
+SET @root_id := (
+ SELECT organization_id FROM sys_organization
+ WHERE tenant_id = @tenant_id AND organization_name = '广西体育中心' AND deleted = 0
+ ORDER BY organization_id LIMIT 1
+);
+
+-- ---------------------------------------------------------------- 部门
+INSERT INTO sys_organization
+ (parent_id, organization_name, organization_full_name, organization_code,
+ organization_type, park, phone, email, business, industry, image, about,
+ sort_number, tenant_id, deleted)
+SELECT @root_id, '运营管理部', '运营管理部', 'APPROVAL_OPS',
+ '部门', '', '', '', '', '', '', '', 110, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_OPS' OR organization_name = '运营管理部')
+);
+
+INSERT INTO sys_organization
+ (parent_id, organization_name, organization_full_name, organization_code,
+ organization_type, park, phone, email, business, industry, image, about,
+ sort_number, tenant_id, deleted)
+SELECT @root_id, '安全运保部', '安全运保部', 'APPROVAL_SAFETY',
+ '部门', '', '', '', '', '', '', '', 120, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_SAFETY' OR organization_name IN ('安全运保部', '运保部'))
+);
+
+INSERT INTO sys_organization
+ (parent_id, organization_name, organization_full_name, organization_code,
+ organization_type, park, phone, email, business, industry, image, about,
+ sort_number, tenant_id, deleted)
+SELECT @root_id, '财务部', '财务部', 'APPROVAL_FINANCE',
+ '部门', '', '', '', '', '', '', '', 130, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_FINANCE' OR organization_name = '财务部')
+);
+
+SET @venue_id := (
+ SELECT organization_id FROM sys_organization
+ WHERE tenant_id = @tenant_id AND organization_name = '场馆部' AND deleted = 0
+ ORDER BY organization_id LIMIT 1
+);
+SET @ops_id := (
+ SELECT organization_id FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_OPS' OR organization_name = '运营管理部')
+ ORDER BY organization_id LIMIT 1
+);
+SET @safety_id := (
+ SELECT organization_id FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_SAFETY' OR organization_name IN ('安全运保部', '运保部'))
+ ORDER BY organization_id LIMIT 1
+);
+SET @finance_id := (
+ SELECT organization_id FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0
+ AND (organization_code = 'APPROVAL_FINANCE' OR organization_name = '财务部')
+ ORDER BY organization_id LIMIT 1
+);
+
+-- ---------------------------------------------------------------- 部门负责人（或签）
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '场馆部负责人', CONCAT('dept_leader_', @venue_id), '审批种子：场馆部负责人，多人或签', 901, @tenant_id, 0
+FROM DUAL
+WHERE @venue_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_leader_', @venue_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '运营管理部负责人', CONCAT('dept_leader_', @ops_id), '审批种子：运营管理部负责人，多人或签', 902, @tenant_id, 0
+FROM DUAL
+WHERE @ops_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_leader_', @ops_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '安全运保部负责人', CONCAT('dept_leader_', @safety_id), '审批种子：安全运保部负责人，多人或签', 903, @tenant_id, 0
+FROM DUAL
+WHERE @safety_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_leader_', @safety_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '财务部负责人', CONCAT('dept_leader_', @finance_id), '审批种子：财务部负责人，多人或签', 904, @tenant_id, 0
+FROM DUAL
+WHERE @finance_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_leader_', @finance_id)
+);
+
+-- ---------------------------------------------------------------- 部门分管领导（二期使用，或签）
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '场馆部分管领导', CONCAT('dept_deputy_', @venue_id), '审批种子：场馆部分管领导，多人或签', 911, @tenant_id, 0
+FROM DUAL
+WHERE @venue_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_deputy_', @venue_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '运营管理部分管领导', CONCAT('dept_deputy_', @ops_id), '审批种子：运营管理部分管领导，多人或签', 912, @tenant_id, 0
+FROM DUAL
+WHERE @ops_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_deputy_', @ops_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '安全运保部分管领导', CONCAT('dept_deputy_', @safety_id), '审批种子：安全运保部分管领导，多人或签', 913, @tenant_id, 0
+FROM DUAL
+WHERE @safety_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_deputy_', @safety_id)
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '财务部分管领导', CONCAT('dept_deputy_', @finance_id), '审批种子：财务部分管领导，多人或签', 914, @tenant_id, 0
+FROM DUAL
+WHERE @finance_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = CONCAT('dept_deputy_', @finance_id)
+);
+
+-- ---------------------------------------------------------------- 租户岗位（或签）
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '收文员', 'approval_archivist', '审批种子：归档节点，多人或签', 921, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = 'approval_archivist'
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '总经理', 'approval_general_manager', '审批种子：总经理/主要领导节点，多人或签', 922, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = 'approval_general_manager'
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '出纳', 'approval_cashier', '审批种子：收据申请单出纳节点，多人或签', 923, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = 'approval_cashier'
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '录入员', 'approval_typist', '审批种子：车辆免收费登记存档节点，多人或签', 924, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = 'approval_typist'
+);
+
+INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
+SELECT '发放人', 'approval_issuer', '审批种子：体验券领用发放节点，多人或签', 925, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
+ AND role_code = 'approval_issuer'
+);
From 4929dbc3d3d8e047d21c3e1c0c8f4e13b18f7424 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sat, 31 Oct 2026 01:35:48 +0800
Subject: [PATCH 16/18] =?UTF-8?q?fix:=20=E5=9C=BA=E9=A6=86=E9=83=A8?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=A7=8D=E5=AD=90=E6=96=B0=E5=BB=BA=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=A4=8D=E7=94=A8=E5=8E=86=E5=8F=B2=E9=83=A8?=
=?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/03-approval_orgs_roles.sql | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/sql/03-approval_orgs_roles.sql b/sql/03-approval_orgs_roles.sql
index 8f58cc3..edd55a1 100644
--- a/sql/03-approval_orgs_roles.sql
+++ b/sql/03-approval_orgs_roles.sql
@@ -3,7 +3,7 @@
-- 执行顺序：01-approval.sql -> 02-approval_menu.sql -> 03-approval_orgs_roles.sql
--
-- 覆盖 0630 九类线下审批涉及的部门与岗位：
--- 部门：场馆部（已存在则复用）、运营管理部、安全运保部、财务部
+-- 部门：场馆部、运营管理部、安全运保部、财务部（均为新建，不复用历史部门）
-- 部门岗位：dept_leader_（负责人）、dept_deputy_（分管领导）
-- 租户岗位：approval_archivist（收文员）、approval_general_manager（总经理/主要领导）、
-- approval_cashier（出纳）、approval_typist（录入员）、approval_issuer（发放人）
@@ -19,6 +19,19 @@ SET @root_id := (
);
-- ---------------------------------------------------------------- 部门
+-- 场馆部按种子编码新建；历史同名部门不更新、不删除。
+INSERT INTO sys_organization
+ (parent_id, organization_name, organization_full_name, organization_code,
+ organization_type, park, phone, email, business, industry, image, about,
+ sort_number, tenant_id, deleted)
+SELECT @root_id, '场馆部', '场馆部', 'APPROVAL_VENUE',
+ '部门', '', '', '', '', '', '', '', 100, @tenant_id, 0
+FROM DUAL
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_VENUE'
+);
+
INSERT INTO sys_organization
(parent_id, organization_name, organization_full_name, organization_code,
organization_type, park, phone, email, business, industry, image, about,
@@ -60,7 +73,7 @@ WHERE NOT EXISTS (
SET @venue_id := (
SELECT organization_id FROM sys_organization
- WHERE tenant_id = @tenant_id AND organization_name = '场馆部' AND deleted = 0
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_VENUE'
ORDER BY organization_id LIMIT 1
);
SET @ops_id := (
From 8953fc3088c633e28ba670004e8bde064a914521 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sat, 31 Oct 2026 01:57:35 +0800
Subject: [PATCH 17/18] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E5=B2=97?=
=?UTF-8?q?=E4=BD=8D=E8=A7=92=E8=89=B2=E6=A0=87=E8=AF=86=E6=94=B9=E7=94=A8?=
=?UTF-8?q?=20organization=5Fcode=EF=BC=8C=E7=BC=BA=E7=BC=96=E7=A0=81?=
=?UTF-8?q?=E9=98=BB=E6=96=AD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/03-approval_orgs_roles.sql | 84 +++++++++----------
.../approval/constant/ApprovalConstants.java | 20 ++++-
.../service/ApprovalInstanceService.java | 17 ++--
.../approval/service/ApprovalTaskService.java | 16 +++-
.../approval/ApprovalCompletionDraftIT.java | 22 ++++-
.../approval/ApprovalConfirmArchiveIT.java | 2 +-
.../approval/ApprovalCoordinationIT.java | 6 +-
.../approval/ApprovalDispatchIT.java | 4 +-
.../gxwebsoft/approval/ApprovalPcTodoIT.java | 2 +-
.../gxwebsoft/approval/ApprovalQueryIT.java | 2 +-
.../gxwebsoft/approval/ApprovalTaskIT.java | 6 +-
.../gxwebsoft/support/ApprovalTestData.java | 21 ++++-
12 files changed, 132 insertions(+), 70 deletions(-)
diff --git a/sql/03-approval_orgs_roles.sql b/sql/03-approval_orgs_roles.sql
index edd55a1..5ab349c 100644
--- a/sql/03-approval_orgs_roles.sql
+++ b/sql/03-approval_orgs_roles.sql
@@ -4,7 +4,7 @@
--
-- 覆盖 0630 九类线下审批涉及的部门与岗位：
-- 部门：场馆部、运营管理部、安全运保部、财务部（均为新建，不复用历史部门）
--- 部门岗位：dept_leader_（负责人）、dept_deputy_（分管领导）
+-- 部门岗位：dept_leader_（负责人）、dept_deputy_（分管领导）
-- 租户岗位：approval_archivist（收文员）、approval_general_manager（总经理/主要领导）、
-- approval_cashier（出纳）、approval_typist（录入员）、approval_issuer（发放人）
--
@@ -41,8 +41,7 @@ SELECT @root_id, '运营管理部', '运营管理部', 'APPROVAL_OPS',
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_OPS' OR organization_name = '运营管理部')
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_OPS'
);
INSERT INTO sys_organization
@@ -54,8 +53,7 @@ SELECT @root_id, '安全运保部', '安全运保部', 'APPROVAL_SAFETY',
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_SAFETY' OR organization_name IN ('安全运保部', '运保部'))
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_SAFETY'
);
INSERT INTO sys_organization
@@ -67,98 +65,94 @@ SELECT @root_id, '财务部', '财务部', 'APPROVAL_FINANCE',
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_FINANCE' OR organization_name = '财务部')
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_FINANCE'
);
-SET @venue_id := (
- SELECT organization_id FROM sys_organization
+SET @venue_code := (
+ SELECT organization_code FROM sys_organization
WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_VENUE'
ORDER BY organization_id LIMIT 1
);
-SET @ops_id := (
- SELECT organization_id FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_OPS' OR organization_name = '运营管理部')
+SET @ops_code := (
+ SELECT organization_code FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_OPS'
ORDER BY organization_id LIMIT 1
);
-SET @safety_id := (
- SELECT organization_id FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_SAFETY' OR organization_name IN ('安全运保部', '运保部'))
+SET @safety_code := (
+ SELECT organization_code FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_SAFETY'
ORDER BY organization_id LIMIT 1
);
-SET @finance_id := (
- SELECT organization_id FROM sys_organization
- WHERE tenant_id = @tenant_id AND deleted = 0
- AND (organization_code = 'APPROVAL_FINANCE' OR organization_name = '财务部')
+SET @finance_code := (
+ SELECT organization_code FROM sys_organization
+ WHERE tenant_id = @tenant_id AND deleted = 0 AND organization_code = 'APPROVAL_FINANCE'
ORDER BY organization_id LIMIT 1
);
-- ---------------------------------------------------------------- 部门负责人（或签）
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '场馆部负责人', CONCAT('dept_leader_', @venue_id), '审批种子：场馆部负责人，多人或签', 901, @tenant_id, 0
+SELECT '场馆部负责人', CONCAT('dept_leader_', @venue_code), '审批种子：场馆部负责人，多人或签', 901, @tenant_id, 0
FROM DUAL
-WHERE @venue_id IS NOT NULL AND NOT EXISTS (
+WHERE @venue_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_leader_', @venue_id)
+ AND role_code = CONCAT('dept_leader_', @venue_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '运营管理部负责人', CONCAT('dept_leader_', @ops_id), '审批种子：运营管理部负责人，多人或签', 902, @tenant_id, 0
+SELECT '运营管理部负责人', CONCAT('dept_leader_', @ops_code), '审批种子：运营管理部负责人，多人或签', 902, @tenant_id, 0
FROM DUAL
-WHERE @ops_id IS NOT NULL AND NOT EXISTS (
+WHERE @ops_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_leader_', @ops_id)
+ AND role_code = CONCAT('dept_leader_', @ops_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '安全运保部负责人', CONCAT('dept_leader_', @safety_id), '审批种子：安全运保部负责人，多人或签', 903, @tenant_id, 0
+SELECT '安全运保部负责人', CONCAT('dept_leader_', @safety_code), '审批种子：安全运保部负责人，多人或签', 903, @tenant_id, 0
FROM DUAL
-WHERE @safety_id IS NOT NULL AND NOT EXISTS (
+WHERE @safety_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_leader_', @safety_id)
+ AND role_code = CONCAT('dept_leader_', @safety_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '财务部负责人', CONCAT('dept_leader_', @finance_id), '审批种子：财务部负责人，多人或签', 904, @tenant_id, 0
+SELECT '财务部负责人', CONCAT('dept_leader_', @finance_code), '审批种子：财务部负责人，多人或签', 904, @tenant_id, 0
FROM DUAL
-WHERE @finance_id IS NOT NULL AND NOT EXISTS (
+WHERE @finance_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_leader_', @finance_id)
+ AND role_code = CONCAT('dept_leader_', @finance_code)
);
-- ---------------------------------------------------------------- 部门分管领导（二期使用，或签）
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '场馆部分管领导', CONCAT('dept_deputy_', @venue_id), '审批种子：场馆部分管领导，多人或签', 911, @tenant_id, 0
+SELECT '场馆部分管领导', CONCAT('dept_deputy_', @venue_code), '审批种子：场馆部分管领导，多人或签', 911, @tenant_id, 0
FROM DUAL
-WHERE @venue_id IS NOT NULL AND NOT EXISTS (
+WHERE @venue_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_deputy_', @venue_id)
+ AND role_code = CONCAT('dept_deputy_', @venue_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '运营管理部分管领导', CONCAT('dept_deputy_', @ops_id), '审批种子：运营管理部分管领导，多人或签', 912, @tenant_id, 0
+SELECT '运营管理部分管领导', CONCAT('dept_deputy_', @ops_code), '审批种子：运营管理部分管领导，多人或签', 912, @tenant_id, 0
FROM DUAL
-WHERE @ops_id IS NOT NULL AND NOT EXISTS (
+WHERE @ops_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_deputy_', @ops_id)
+ AND role_code = CONCAT('dept_deputy_', @ops_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '安全运保部分管领导', CONCAT('dept_deputy_', @safety_id), '审批种子：安全运保部分管领导，多人或签', 913, @tenant_id, 0
+SELECT '安全运保部分管领导', CONCAT('dept_deputy_', @safety_code), '审批种子：安全运保部分管领导，多人或签', 913, @tenant_id, 0
FROM DUAL
-WHERE @safety_id IS NOT NULL AND NOT EXISTS (
+WHERE @safety_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_deputy_', @safety_id)
+ AND role_code = CONCAT('dept_deputy_', @safety_code)
);
INSERT INTO sys_role (role_name, role_code, comments, sort_number, tenant_id, deleted)
-SELECT '财务部分管领导', CONCAT('dept_deputy_', @finance_id), '审批种子：财务部分管领导，多人或签', 914, @tenant_id, 0
+SELECT '财务部分管领导', CONCAT('dept_deputy_', @finance_code), '审批种子：财务部分管领导，多人或签', 914, @tenant_id, 0
FROM DUAL
-WHERE @finance_id IS NOT NULL AND NOT EXISTS (
+WHERE @finance_code IS NOT NULL AND NOT EXISTS (
SELECT 1 FROM sys_role WHERE tenant_id = @tenant_id AND deleted = 0
- AND role_code = CONCAT('dept_deputy_', @finance_id)
+ AND role_code = CONCAT('dept_deputy_', @finance_code)
);
-- ---------------------------------------------------------------- 租户岗位（或签）
diff --git a/src/main/java/com/gxwebsoft/approval/constant/ApprovalConstants.java b/src/main/java/com/gxwebsoft/approval/constant/ApprovalConstants.java
index cd8b795..e922c47 100644
--- a/src/main/java/com/gxwebsoft/approval/constant/ApprovalConstants.java
+++ b/src/main/java/com/gxwebsoft/approval/constant/ApprovalConstants.java
@@ -186,7 +186,23 @@ public final class ApprovalConstants {
return STATUS_ARCHIVED.equals(status) ? "单据已归档，不能修改" : "当前状态不可修改";
}
- public static String departmentLeaderRoleCode(Integer organizationId) {
- return organizationId == null ? null : "dept_leader_" + organizationId;
+ /**
+ * 部门岗位角色标识：后缀取启用组织的 organization_code。
+ * 部门未配置编码时返回 null，由调用方阻断并提示。
+ */
+ public static String departmentLeaderRoleCode(String organizationCode) {
+ return departmentRoleCode("dept_leader_", organizationCode);
+ }
+
+ public static String departmentDeputyRoleCode(String organizationCode) {
+ return departmentRoleCode("dept_deputy_", organizationCode);
+ }
+
+ private static String departmentRoleCode(String prefix, String organizationCode) {
+ if (organizationCode == null) {
+ return null;
+ }
+ String code = organizationCode.trim();
+ return code.isEmpty() ? null : prefix + code;
}
}
diff --git a/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java b/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
index 0c58f4f..6fd8044 100644
--- a/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
+++ b/src/main/java/com/gxwebsoft/approval/service/ApprovalInstanceService.java
@@ -161,8 +161,11 @@ public class ApprovalInstanceService {
if (organization == null) {
throw new BusinessException("未归属部门，无法提交");
}
- List leaders = directoryService.listRoleMembers(
- ApprovalConstants.departmentLeaderRoleCode(organizationId));
+ String leaderRoleCode = ApprovalConstants.departmentLeaderRoleCode(organization.getOrganizationCode());
+ if (leaderRoleCode == null) {
+ throw new BusinessException("部门未配置编码，无法提交");
+ }
+ List leaders = directoryService.listRoleMembers(leaderRoleCode);
if (leaders.isEmpty()) {
throw new BusinessException("报送部门负责人角色缺配");
}
@@ -193,13 +196,17 @@ public class ApprovalInstanceService {
if (acceptOrgId == null || acceptOrgId <= 0) {
throw new BusinessException("请选择受理部门");
}
- if (directoryService.listRoleMembers(ApprovalConstants.departmentLeaderRoleCode(acceptOrgId)).isEmpty()) {
- throw new BusinessException("受理部门负责人角色缺配");
- }
ApprovalOrganizationVO acceptOrganization = directoryService.getOrganization(acceptOrgId);
if (acceptOrganization == null) {
throw new BusinessException("受理部门已停用");
}
+ String leaderRoleCode = ApprovalConstants.departmentLeaderRoleCode(acceptOrganization.getOrganizationCode());
+ if (leaderRoleCode == null) {
+ throw new BusinessException("受理部门未配置编码");
+ }
+ if (directoryService.listRoleMembers(leaderRoleCode).isEmpty()) {
+ throw new BusinessException("受理部门负责人角色缺配");
+ }
return acceptOrganization;
}
diff --git a/src/main/java/com/gxwebsoft/approval/service/ApprovalTaskService.java b/src/main/java/com/gxwebsoft/approval/service/ApprovalTaskService.java
index 381dd26..0d97c9f 100644
--- a/src/main/java/com/gxwebsoft/approval/service/ApprovalTaskService.java
+++ b/src/main/java/com/gxwebsoft/approval/service/ApprovalTaskService.java
@@ -13,6 +13,7 @@ import com.gxwebsoft.approval.param.ApprovalTaskDispatchParam;
import com.gxwebsoft.approval.support.ApprovalApprover;
import com.gxwebsoft.approval.support.ApprovalNode;
import com.gxwebsoft.approval.vo.ApprovalAssignVO;
+import com.gxwebsoft.approval.vo.ApprovalOrganizationVO;
import com.gxwebsoft.approval.vo.ApprovalUserVO;
import com.gxwebsoft.common.core.exception.BusinessException;
import com.gxwebsoft.common.system.entity.User;
@@ -545,9 +546,9 @@ public class ApprovalTaskService {
}
switch (resolver) {
case RESOLVER_REPORTER_ORG_LEADER:
- return roleApprovers(ApprovalConstants.departmentLeaderRoleCode(instance.getReportOrgId()));
+ return departmentLeaderApprovers(instance.getReportOrgId());
case RESOLVER_ACCEPT_ORG_LEADER:
- return roleApprovers(ApprovalConstants.departmentLeaderRoleCode(instance.getAcceptOrgId()));
+ return departmentLeaderApprovers(instance.getAcceptOrgId());
case RESOLVER_ARCHIVIST:
return roleApprovers(ApprovalConstants.ROLE_ARCHIVIST);
case RESOLVER_REPORTER:
@@ -561,6 +562,17 @@ public class ApprovalTaskService {
}
}
+ /**
+ * 部门负责人审批人：按部门 organization_code 解析角色；部门或编码缺失时返回空列表，
+ * 节点保持缺配状态，等待管理员补配置。
+ */
+ private List departmentLeaderApprovers(Integer organizationId) {
+ ApprovalOrganizationVO organization = directoryService.getOrganization(organizationId);
+ String roleCode = organization == null
+ ? null : ApprovalConstants.departmentLeaderRoleCode(organization.getOrganizationCode());
+ return roleCode == null ? Collections.emptyList() : roleApprovers(roleCode);
+ }
+
private List confirmCandidateIds(ApprovalInstance instance) {
List ids = new ArrayList<>();
if (instance.getReporterId() != null) {
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
index 509b4c0..972a0a0 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
@@ -136,6 +136,24 @@ class ApprovalCompletionDraftIT {
assertThat(bizNo(instanceId)).isNull();
}
+ @Test
+ void rejectsSubmitWhenDepartmentCodeMissing() throws Exception {
+ Integer noCodeOrg = data.createOrganization("无编码部门" + data.uniqueSuffix(), 136);
+ data.clearOrganizationCode(noCodeOrg);
+ ApprovalTestData.TestUser noCodeReporter =
+ data.createUser("无编码报送人" + data.uniqueSuffix(), noCodeOrg);
+ long instanceId = createCompletion(noCodeReporter, noCodeOrg, TENANT, "无编码单据");
+
+ mockMvc.perform(authed(post("/api/approval/instance/" + instanceId + "/submit"),
+ noCodeReporter, noCodeOrg, TENANT, SUBMIT))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value(1))
+ .andExpect(jsonPath("$.message").value(org.hamcrest.Matchers.containsString("部门未配置编码")));
+
+ assertThat(instanceStatus(instanceId)).isEqualTo("DRAFT");
+ assertThat(bizNo(instanceId)).isNull();
+ }
+
@Test
void rejectsSubmitWhenDepartmentLeaderRoleMissing() throws Exception {
long instanceId = createCompletion(reporter, organizationId, TENANT, "缺负责人");
@@ -263,7 +281,7 @@ class ApprovalCompletionDraftIT {
int otherTenant = 10023;
Integer otherOrg = data.createOrganization("外租户部门" + data.uniqueSuffix(), 136, otherTenant);
ApprovalTestData.TestUser otherReporter = data.createUser("外租户报送人" + data.uniqueSuffix(), otherOrg, otherTenant);
- ApprovalTestData.TestRole otherLeaderRole = data.createRole("dept_leader_" + otherOrg, "外租户负责人", otherTenant);
+ ApprovalTestData.TestRole otherLeaderRole = data.createRole(data.leaderRoleCode(otherOrg), "外租户负责人", otherTenant);
ApprovalTestData.TestUser otherLeader = data.createUser("外租户负责人" + data.uniqueSuffix(), otherOrg, otherTenant);
data.bindTenant(otherLeader.userId, otherLeaderRole.roleId, otherTenant);
ApprovalTestData.TestRole otherArchivistRole = data.createRole("approval_archivist", "外租户收文员", otherTenant);
@@ -476,7 +494,7 @@ class ApprovalCompletionDraftIT {
}
private List grantDepartmentLeader(int orgId, int tenant, int memberCount) {
- ApprovalTestData.TestRole role = data.createRole("dept_leader_" + orgId, "部门负责人", tenant);
+ ApprovalTestData.TestRole role = data.createRole(data.leaderRoleCode(orgId), "部门负责人", tenant);
List members = new ArrayList<>();
for (int i = 0; i < memberCount; i++) {
ApprovalTestData.TestUser member = data.createUser("负责人" + data.uniqueSuffix(), orgId, tenant);
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalConfirmArchiveIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalConfirmArchiveIT.java
index c89dc95..1348d78 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalConfirmArchiveIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalConfirmArchiveIT.java
@@ -69,7 +69,7 @@ class ApprovalConfirmArchiveIT {
organizationId = data.createOrganization("归档部门" + data.uniqueSuffix(), 136, TENANT);
reporter = data.createUser("归档报送人" + data.uniqueSuffix(), organizationId, TENANT);
ApprovalTestData.TestRole leaderRole =
- data.createRole("dept_leader_" + organizationId, "部门负责人", TENANT);
+ data.createRole(data.leaderRoleCode(organizationId), "部门负责人", TENANT);
leader = data.createUser("归档负责人" + data.uniqueSuffix(), organizationId, TENANT);
data.bindTenant(leader.userId, leaderRole.roleId, TENANT);
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
index 78e354a..6f4caa7 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalCoordinationIT.java
@@ -368,8 +368,8 @@ class ApprovalCoordinationIT {
@Test
void allowsSamePersonToHandleBothApprovalNodes() throws Exception {
ApprovalTestData.TestUser both = data.createUser("双部门负责人" + data.uniqueSuffix(), reportOrgId);
- ApprovalTestData.TestRole reportRole = data.createRole("dept_leader_" + reportOrgId, "部门负责人");
- ApprovalTestData.TestRole acceptRole = data.createRole("dept_leader_" + acceptOrgId, "部门负责人");
+ ApprovalTestData.TestRole reportRole = data.createRole(data.leaderRoleCode(reportOrgId), "部门负责人");
+ ApprovalTestData.TestRole acceptRole = data.createRole(data.leaderRoleCode(acceptOrgId), "部门负责人");
data.bind(both.userId, reportRole.roleId);
data.bind(both.userId, acceptRole.roleId);
grantArchivist();
@@ -523,7 +523,7 @@ class ApprovalCoordinationIT {
}
private List grantDepartmentLeader(int orgId, int memberCount) {
- ApprovalTestData.TestRole role = data.createRole("dept_leader_" + orgId, "部门负责人");
+ ApprovalTestData.TestRole role = data.createRole(data.leaderRoleCode(orgId), "部门负责人");
List members = new ArrayList<>();
for (int i = 0; i < memberCount; i++) {
ApprovalTestData.TestUser member = data.createUser("协调负责人" + data.uniqueSuffix(), orgId);
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
index 4930675..9851d5f 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalDispatchIT.java
@@ -79,12 +79,12 @@ class ApprovalDispatchIT {
reporter = data.createUser("派单报送人" + data.uniqueSuffix(), reportOrgId, TENANT);
ApprovalTestData.TestRole reportLeaderRole =
- data.createRole("dept_leader_" + reportOrgId, "报送部门负责人", TENANT);
+ data.createRole(data.leaderRoleCode(reportOrgId), "报送部门负责人", TENANT);
reportLeader = data.createUser("派单报送负责人" + data.uniqueSuffix(), reportOrgId, TENANT);
data.bindTenant(reportLeader.userId, reportLeaderRole.roleId, TENANT);
ApprovalTestData.TestRole acceptLeaderRole =
- data.createRole("dept_leader_" + acceptOrgId, "受理部门负责人", TENANT);
+ data.createRole(data.leaderRoleCode(acceptOrgId), "受理部门负责人", TENANT);
acceptLeader = data.createUser("派单受理负责人" + data.uniqueSuffix(), acceptOrgId, TENANT);
data.bindTenant(acceptLeader.userId, acceptLeaderRole.roleId, TENANT);
acceptMember = data.createUser("派单受理成员" + data.uniqueSuffix(), acceptOrgId, TENANT);
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
index 8ca1e2d..3ed7220 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalPcTodoIT.java
@@ -66,7 +66,7 @@ class ApprovalPcTodoIT {
organizationId = data.createOrganization("PC待办部门" + data.uniqueSuffix(), 136);
reporter = data.createUser("PC报送人" + data.uniqueSuffix(), organizationId);
ApprovalTestData.TestRole leaderRole =
- data.createRole("dept_leader_" + organizationId, "部门负责人");
+ data.createRole(data.leaderRoleCode(organizationId), "部门负责人");
leader = data.createUser("PC负责人" + data.uniqueSuffix(), organizationId);
data.bind(leader.userId, leaderRole.roleId);
ApprovalTestData.TestRole archivistRole = data.createRole("approval_archivist", "收文员");
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
index 31f2d62..98bb22a 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalQueryIT.java
@@ -319,7 +319,7 @@ class ApprovalQueryIT {
}
private void grantDepartmentLeader() {
- ApprovalTestData.TestRole role = data.createRole("dept_leader_" + reportOrgId, "部门负责人");
+ ApprovalTestData.TestRole role = data.createRole(data.leaderRoleCode(reportOrgId), "部门负责人");
ApprovalTestData.TestUser leader = data.createUser("负责人" + data.uniqueSuffix(), reportOrgId);
data.bind(leader.userId, role.roleId);
}
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalTaskIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalTaskIT.java
index 4dfc907..2d32581 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalTaskIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalTaskIT.java
@@ -65,7 +65,7 @@ class ApprovalTaskIT {
organizationId = data.createOrganization("任务部门" + data.uniqueSuffix(), 136);
reporter = data.createUser("任务报送人" + data.uniqueSuffix(), organizationId);
ApprovalTestData.TestRole leaderRole =
- data.createRole("dept_leader_" + organizationId, "部门负责人");
+ data.createRole(data.leaderRoleCode(organizationId), "部门负责人");
leader = data.createUser("任务负责人" + data.uniqueSuffix(), organizationId);
data.bind(leader.userId, leaderRole.roleId);
ApprovalTestData.TestRole archivistRole = data.createRole("approval_archivist", "收文员");
@@ -167,7 +167,7 @@ class ApprovalTaskIT {
ApprovalTestData.TestUser second =
data.createUser("第二负责人" + data.uniqueSuffix(), organizationId);
Integer leaderRoleId = data.server().queryForObject("SELECT role_id FROM sys_role WHERE role_code = ? AND tenant_id = ?",
- Integer.class, "dept_leader_" + organizationId, TENANT);
+ Integer.class, data.leaderRoleCode(organizationId), TENANT);
data.bind(second.userId, leaderRoleId);
long instanceId = createAndSubmit("或签取消");
@@ -243,7 +243,7 @@ class ApprovalTaskIT {
@Test
void allowsReporterToApproveOwnTask() throws Exception {
Integer leaderRoleId = data.server().queryForObject("SELECT role_id FROM sys_role WHERE role_code = ? AND tenant_id = ?",
- Integer.class, "dept_leader_" + organizationId, TENANT);
+ Integer.class, data.leaderRoleCode(organizationId), TENANT);
data.bind(reporter.userId, leaderRoleId);
long instanceId = createAndSubmit("自审单据");
diff --git a/src/test/java/com/gxwebsoft/support/ApprovalTestData.java b/src/test/java/com/gxwebsoft/support/ApprovalTestData.java
index 913b843..884bca9 100644
--- a/src/test/java/com/gxwebsoft/support/ApprovalTestData.java
+++ b/src/test/java/com/gxwebsoft/support/ApprovalTestData.java
@@ -80,10 +80,11 @@ public class ApprovalTestData {
}
public Integer createOrganization(String name, int parentId, int tenantId) {
+ String code = "T_" + uniqueSuffix();
Integer id = insert(server,
- "INSERT INTO sys_organization (organization_name, parent_id, organization_type, deleted, tenant_id) "
- + "VALUES (?, ?, 'dept', 0, ?)",
- name, parentId, tenantId);
+ "INSERT INTO sys_organization (organization_name, organization_code, parent_id, organization_type, deleted, tenant_id) "
+ + "VALUES (?, ?, ?, 'dept', 0, ?)",
+ name, code, parentId, tenantId);
organizationIds.add(id);
return id;
}
@@ -92,6 +93,20 @@ public class ApprovalTestData {
return createOrganization(name, parentId, TestAuthentication.TENANT_ID);
}
+ public String organizationCode(Integer organizationId) {
+ return server.queryForObject(
+ "SELECT organization_code FROM sys_organization WHERE organization_id = ?",
+ String.class, organizationId);
+ }
+
+ public String leaderRoleCode(Integer organizationId) {
+ return "dept_leader_" + organizationCode(organizationId);
+ }
+
+ public void clearOrganizationCode(int organizationId) {
+ server.update("UPDATE sys_organization SET organization_code = NULL WHERE organization_id = ?", organizationId);
+ }
+
public void disableOrganization(int organizationId) {
server.update("UPDATE sys_organization SET deleted = 1 WHERE organization_id = ?", organizationId);
}
From 47b55bad040ef1899e54ba8f53923d7b85a5fda7 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sat, 31 Oct 2026 02:42:41 +0800
Subject: [PATCH 18/18] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E9=93=BE?=
=?UTF-8?q?=E6=8E=A5=E8=B5=B0=E4=B8=8B=E8=BD=BD=E7=AB=AF=E7=82=B9=EF=BC=9B?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AE=B0=E5=BD=95=E5=88=87=E5=88=B0=20core?=
=?UTF-8?q?=20=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../approval/service/ApprovalExportService.java | 3 ++-
.../service/impl/FileRecordServiceImpl.java | 2 ++
.../approval/ApprovalCompletionDraftIT.java | 15 +++++++++++----
.../com/gxwebsoft/approval/ApprovalExportIT.java | 2 +-
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gxwebsoft/approval/service/ApprovalExportService.java b/src/main/java/com/gxwebsoft/approval/service/ApprovalExportService.java
index 1138044..483965c 100644
--- a/src/main/java/com/gxwebsoft/approval/service/ApprovalExportService.java
+++ b/src/main/java/com/gxwebsoft/approval/service/ApprovalExportService.java
@@ -103,7 +103,8 @@ public class ApprovalExportService {
record.setLength(target.length());
record.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
record.setCreateUserId(user.getUserId());
- record.setUrl(config.getServerUrl() + "/file/" + filename);
+ record.setUrl(config.getServerUrl() + "/file/download/" + filename);
+ record.setDownloadUrl(record.getUrl());
fileService.save(record);
return new ApprovalExportResult(record, rows.size());
}
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java
index 72c9c27..899c492 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java
@@ -1,5 +1,6 @@
package com.gxwebsoft.common.system.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.common.core.utils.CommonUtil;
import com.gxwebsoft.common.core.web.PageParam;
@@ -21,6 +22,7 @@ import java.util.List;
* @since 2021-08-30 11:21:01
*/
@Service
+@DS("server")
public class FileRecordServiceImpl extends ServiceImpl implements FileRecordService {
@Override
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
index 972a0a0..fda8d53 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalCompletionDraftIT.java
@@ -169,12 +169,19 @@ class ApprovalCompletionDraftIT {
@Test
void rejectsSubmitWhenArchivistRoleMissing() throws Exception {
- grantDepartmentLeader(organizationId, TENANT);
- long instanceId = createCompletion(reporter, organizationId, TENANT, "缺收文员");
- uploadAttachment(instanceId, reporter, organizationId, "image/png");
+ int tenant = 10023;
+ Integer orgId = data.createOrganization("缺收文员部门" + data.uniqueSuffix(), 136, tenant);
+ ApprovalTestData.TestUser submitter =
+ data.createUser("缺收文员报送人" + data.uniqueSuffix(), orgId, tenant);
+ ApprovalTestData.TestRole leaderRole =
+ data.createRole(data.leaderRoleCode(orgId), "部门负责人", tenant);
+ ApprovalTestData.TestUser leader = data.createUser("缺收文员负责人" + data.uniqueSuffix(), orgId, tenant);
+ data.bindTenant(leader.userId, leaderRole.roleId, tenant);
+ long instanceId = createCompletion(submitter, orgId, tenant, "缺收文员");
+ uploadAttachment(instanceId, submitter, orgId, tenant, "image/png");
mockMvc.perform(authed(post("/api/approval/instance/" + instanceId + "/submit"),
- reporter, organizationId, TENANT, SUBMIT))
+ submitter, orgId, tenant, SUBMIT))
.andExpect(jsonPath("$.code").value(1))
.andExpect(jsonPath("$.message").value(org.hamcrest.Matchers.containsString("收文员角色缺配")));
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
index e9d8aea..12905c3 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalExportIT.java
@@ -172,7 +172,7 @@ class ApprovalExportIT {
assertThat(node.path("id").asInt()).isPositive();
String name = node.path("name").asText();
assertThat(name).startsWith("excel/审批单据-").endsWith(".xlsx");
- assertThat(node.path("url").asText()).contains("/file/excel/审批单据-");
+ assertThat(node.path("url").asText()).contains("/file/download/excel/审批单据-");
File file = new File(node.path("path").asText());
assertThat(file).exists();
exportedFiles.add(file.toPath());