Merge branch 'master-500-dev-joke' into 'master-500-dev'

文档管理查询系统参数code调整

文档管理查询系统参数code调整

See merge request !1075

@@ -256,7 +256,7 @@ export default {
 
         //查询系统参数中省份配置 joke add 20221122
         let getProvince = () => {
-            proxy.$http.get("/api-u/sysConf/getSysConfByCode?code=province", {}, function (res) {
+            proxy.$http.get("/api-u/sysConf/getSysConfByCode?code=location", {}, function (res) {
                 if (res) {
                     province = res;
                 }
@@ -294,13 +294,13 @@ export default {
                         children: res.data
                     }
                     //解决宁夏文档管理名称为运维管理问题  joke add 20221122
-                    if (province != null && province.value && province.desc != '' && province.desc != null){
+                    if (province != null && province.value && province.desc != '' && province.desc != null && province.desc.indexOf('documentName') != -1){
                         var nameObj = JSON.parse(province.desc);
                         root.name = nameObj.documentName;
                     }
                     if (props.isRecycle) {
                         root.name = '文档回收站';
-                        if (province != null && province.value && province.desc != '' && province.desc != null){
+                        if (province != null && province.value && province.desc != '' && province.desc != null && province.desc.indexOf('recyleName') != -1){
                             var nameObj = JSON.parse(province.desc);
                             root.name = nameObj.recyleName;
                         }