fix

getrebuild · Dec 20, 2024 · e93f18f · e93f18f
1 parent cf08de3
commit e93f18f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/rebuild/core/service/approval/ApprovalProcessor.java b/src/main/java/com/rebuild/core/service/approval/ApprovalProcessor.java
@@ -466,7 +466,7 @@ private FlowNode getFlowNode(String nodeNo) {
         try {
             return getFlowParser().getNode(nodeNo);
         } catch (ApprovalException | ConfigurationException ex) {
-            log.warn("Cannot parse node : {} with {}", nodeNo, approvalId, ex);
+            log.debug("Cannot parse node : {} with {}", nodeNo, approvalId, ex);
         }
         return null;
     }
@@ -540,6 +540,8 @@ public JSONArray getWorkedSteps(final boolean allHis) {
             if (FlowNode.NODE_REVOKED.equals(node) || (FlowNode.NODE_CANCELED.equals(node) && !(Boolean) o[13])) {
                 Object[] bLast = batch.get(batch.size() - 2);
                 ID bLastApprovalId = (ID) bLast[12];
+                if (bLastApprovalId == null) continue;  // 流程删除了
+
                 String bLastApprovalName = FieldValueHelper.getLabelNotry(bLastApprovalId);
                 ApprovalStatus bLastStatus = new ApprovalStatus(
                         bLastApprovalId, bLastApprovalName, ApprovalState.REVOKED.getState(), (String) bLast[6], this.recordId);

diff --git a/src/main/java/com/rebuild/web/commons/UsersGetting.java b/src/main/java/com/rebuild/web/commons/UsersGetting.java
@@ -66,8 +66,6 @@ public JSON loadUsers(HttpServletRequest request) {
 
         // v3.2 过滤本部门或下级部门
         members = UserFilters.filterMembers32(members, getRequestUser(request));
-
-        // 排序
         members = UserHelper.sortMembers(members);
 
         JSONArray found = new JSONArray();

diff --git a/src/main/java/com/rebuild/web/contacts/ContactsController.java b/src/main/java/com/rebuild/web/contacts/ContactsController.java
@@ -16,6 +16,7 @@
 import com.rebuild.api.RespBody;
 import com.rebuild.core.Application;
 import com.rebuild.core.privileges.UserFilters;
+import com.rebuild.core.privileges.UserHelper;
 import com.rebuild.core.privileges.UserService;
 import com.rebuild.core.privileges.bizz.Department;
 import com.rebuild.core.privileges.bizz.User;
@@ -94,6 +95,7 @@ public RespBody listUsers(HttpServletRequest request) {
 
         User[] users = Application.getUserStore().getAllUsers();
         Member[] usersMembers = UserFilters.filterMembers32(users, user);
+        usersMembers = UserHelper.sortMembers(usersMembers);
 
         Set<ID> deptAndChild = null;
         if (dept != null) {