账号列表问题

app/controller/sub_proj_setting_controller.js

@@ -224,7 +224,7 @@ module.exports = app => {
                 };
                 const total = await ctx.service.projectAccount.getSubProjectAccountCount(ctx.subProject, filter);
                 const subProjectAccountList = await ctx.service.projectAccount.getSubProjectAccountListWithPermission(ctx.subProject, filter);
-                const subProjectAllAccountList = filter.company || filter.keyword ? await ctx.service.projectAccount.getSubProjectAccountListWithPermission(ctx.subProject) : subProjectAccountList;
+                const subProjectAllAccountList = await ctx.service.projectAccount.getSubProjecAllAccountListWithPermission(ctx.subProject);
                 const subProjectUnitList = unitList.map(item => {
                     const users = subProjectAllAccountList.filter(item1 => item1.company === item.name);
                     return { name: item.name, users };

app/public/js/filing_manage.js

@@ -108,7 +108,7 @@ $(document).ready(function() {
         async setCurFiling(node) {
             filingObj.curFiling = node;
         }
-        moveFiling(node, tree_pid, tree_order, reload = false) {
+        moveFiling(node, tree_pid, tree_order, callback) {
             if (node.file_count > 0) return;
             if (tree_pid === node.source_node.tree_pid && tree_order === node.source_node.tree_order) return;
 
@@ -131,7 +131,7 @@ $(document).ready(function() {
                         }
                     }
                 }
-                self.loadFiling();
+                if (callback) callback();
             });
         }
         batchUpdateFiling(data, callback) {
@@ -232,11 +232,15 @@ $(document).ready(function() {
     });
     $('#up-move').click(() => {
         if (!filingObj.curFiling) return;
-        filingObj.moveFiling(filingObj.curFiling, filingObj.curFiling.tree_pid, filingObj.curFiling.source_node.tree_order - 1);
+        filingObj.moveFiling(filingObj.curFiling, filingObj.curFiling.tree_pid, filingObj.curFiling.source_node.tree_order - 1, function () {
+            filingObj.filingTree.moveNode(filingObj.curFiling.getPreNode(), filingObj.curFiling, "prev", true);
+        });
     });
     $('#down-move').click(() => {
         if (!filingObj.curFiling) return;
-        filingObj.moveFiling(filingObj.curFiling, filingObj.curFiling.tree_pid, filingObj.curFiling.source_node.tree_order + 1);
+        filingObj.moveFiling(filingObj.curFiling, filingObj.curFiling.tree_pid, filingObj.curFiling.source_node.tree_order + 1, function () {
+            filingObj.filingTree.moveNode(filingObj.curFiling.getNextNode(), filingObj.curFiling, "next", true);
+        });
     });
 
     $('#del-filing-ok').click(() => {