Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -594,12 +594,11 @@ export default {
 
 
             if (arr.length == 1) {
             if (arr.length == 1) {
                 // 查询文件的权限
                 // 查询文件的权限
-                proxy.$http.get(`/inspection-report/doc/doc/auth/getGrant`, {docId: arr[0].id}, function (res) {
+                proxy.$http.get(`/inspection-report/file/auth/getGrant`, {docId: arr[0].id}, function (res) {
                     if (res && res.code == 0) {
                     if (res && res.code == 0) {
-                        // {roleIds: ["1"], usernames: ["admin"]}
                         let map = res.map;
                         let map = res.map;
                         if (map) {
                         if (map) {
-                            let all = res.map.roleIds.concat(res.map.usernames);
+                            let all = map.allIds;
                             userFileRight.value = all;
                             userFileRight.value = all;
                         }
                         }
                     }
                     }

@@ -210,12 +210,12 @@ export default {
 
 
         let getUser = () => {
         let getUser = () => {
             let arr = allArr.value;
             let arr = allArr.value;
-
-            if (!arr || arr.length == 0) {
-                proxy.$global.showMsg("您没有选择用户！", "warning")
-                return;
-            }
-
+            // Start Wang 2021/12/28 19:46 删除非空验证，考虑授权时，取消授权，需要清空授权数据
+            // if (!arr || arr.length == 0) {
+            //     proxy.$global.showMsg("您没有选择用户！", "warning")
+            //     return;
+            // }
+            // End Wang 2021/12/28 19:46
 
 
             let user = [];
             let user = [];
             let role = [];
             let role = [];