合同管理权限判断bug修复

app/service/sub_proj_permission.js

@@ -396,8 +396,8 @@ module.exports = app => {
                     uid: r.uid,
                     permission_add: permission.permission_add,
                     permission_edit: permission.permission_edit,
-                    permission_show_unit: permission.permission_show_unit,
                     permission_show_node: permission.permission_show_node,
+                    permission_show_unit: permission.permission_show_unit,
                 });
             }
             return list;
@@ -411,17 +411,17 @@ module.exports = app => {
             if (newContractPermission.permission_edit !== undefined) {
                 oldPermission.permission_edit = newContractPermission.permission_edit;
             }
-            if (newContractPermission.permission_show_unit !== undefined) {
-                oldPermission.permission_show_unit = newContractPermission.permission_show_unit;
-            }
             if (newContractPermission.permission_show_node !== undefined) {
                 oldPermission.permission_show_node = newContractPermission.permission_show_node;
             }
+            if (newContractPermission.permission_show_unit !== undefined) {
+                oldPermission.permission_show_unit = newContractPermission.permission_show_unit;
+            }
             const permissionArr = [];
             if (oldPermission.permission_edit) permissionArr.push(1);
             if (oldPermission.permission_add) permissionArr.push(2);
-            if (oldPermission.permission_show_unit) permissionArr.push(3);
-            if (oldPermission.permission_show_node) permissionArr.push(4);
+            if (oldPermission.permission_show_node) permissionArr.push(3);
+            if (oldPermission.permission_show_unit) permissionArr.push(4);
             if (!oldPermission.permission_show_unit && !oldPermission.permission_show_node) permissionArr.push(5);
             return permissionArr.join(',');
         }
@@ -430,8 +430,8 @@ module.exports = app => {
             const permission = {
                 permission_edit: cp.indexOf(1) !== -1 ? 1: 0,
                 permission_add: cp.indexOf(2) !== -1 ? 1: 0,
-                permission_show_unit: cp.indexOf(3) !== -1 ? 1: 0,
-                permission_show_node: cp.indexOf(4) !== -1 ? 1: 0,
+                permission_show_node: cp.indexOf(3) !== -1 ? 1: 0,
+                permission_show_unit: cp.indexOf(4) !== -1 ? 1: 0,
             };
             return permission;
         }