sasp-admin 0.2.61 → 0.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-admin",
-  "version": "0.2.61",
+  "version": "0.2.63",
   "description": "业务中台-系统管理模块",
   "scripts": {
     "build": "vue-cli-service build"

package/src/components/public/org/sysOrgPosUserSelect.vue

@@ -231,9 +231,22 @@
                 // vm.entOrgDim = JSON.parse(vm.platStringUtil.replaceAll(sysParamObj["sysEntDim.id"],"'","\"") || "{}");;
                 vm.roleTypeMap = JSON.parse(vm.platStringUtil.replaceAll(userDimension,"'","\"") || "{}");
                 if(vm.loginUser.userType != "dev" && vm.loginUser.userType != "sup"){
-                    let filterOrgType = sysParamObj.filterOrgType;
-                    if(filterOrgType){
-                        vm.$set(vm.orgSearchParam,"orgType",filterOrgType);
+                    let filterArea = sysParamObj.filterArea;
+                    if(filterArea == "true"){
+                        let loginDept = vm.USER_GLOBAL.getLoginDept() || {};
+                        if(loginDept && loginDept.id){
+                            if(loginDept.community){
+                                vm.$set(vm.orgSearchParam,"communityLike",loginDept.community);
+                            }else if(loginDept.street){
+                                vm.$set(vm.orgSearchParam,"streetLike",loginDept.street);
+                            }else if(loginDept.area){
+                                vm.$set(vm.orgSearchParam,"areaLike",loginDept.area);
+                            }else if(loginDept.city){
+                                vm.$set(vm.orgSearchParam,"cityLike",loginDept.city);
+                            }else if(loginDept.province){
+                                vm.$set(vm.orgSearchParam,"provinceLike",loginDept.province);
+                            }
+                        }
                     }
                 }
                 vm.init();

package/src/views/org/sysOrgTree.vue

@@ -224,33 +224,50 @@
                         if (vm.loginUser.userType === 'sup' || vm.loginUser.userType === 'dev') {
                             vm.init();
                         }else{
-                            vm.axios.post(vm.api.sysOrgPosUser.find,{"userId":vm.loginUser.id}).then(posUserRes => {
-                                if(posUserRes && posUserRes.data.length > 0){
-                                    let orgTreeId = ""; // 组织树上级
-                                    let dim = ""; // 所在维度
-                                    for(let i = 0; i<posUserRes.data.length;i++){
-                                        if(posUserRes.data[i].orgId){
-                                            if(!dim){
-                                                dim = posUserRes.data[i].orgDim;
-                                            }
-                                            if(posUserRes.data[i].orgDim==dim){
-                                                orgTreeId += ","+posUserRes.data[i].orgId;
+                            let filterArea = sysParams.filterArea;
+                            if(filterArea == "true"){
+                                let loginDept = vm.USER_GLOBAL.getLoginDept() || {};
+                                if(!loginDept || !loginDept.id){
+                                    vm.noAuth = true;
+                                    return;
+                                }
+                                if(loginDept.community){
+                                    vm.$set(vm.treeRequestParam,"communityLike",loginDept.community);
+                                }else if(loginDept.street){
+                                    vm.$set(vm.treeRequestParam,"streetLike",loginDept.street);
+                                }else if(loginDept.area){
+                                    vm.$set(vm.treeRequestParam,"areaLike",loginDept.area);
+                                }else if(loginDept.city){
+                                    vm.$set(vm.treeRequestParam,"cityLike",loginDept.city);
+                                }else if(loginDept.province){
+                                    vm.$set(vm.treeRequestParam,"provinceLike",loginDept.province);
+                                }
+                                vm.init(loginDept.orgDim);
+                            }else{
+                                vm.axios.post(vm.api.sysOrgPosUser.find,{"userId":vm.loginUser.id}).then(posUserRes => {
+                                    if(posUserRes && posUserRes.data.length > 0){
+                                        let orgTreeId = ""; // 组织树上级
+                                        let dim = ""; // 所在维度
+                                        for(let i = 0; i<posUserRes.data.length;i++){
+                                            if(posUserRes.data[i].orgId){
+                                                if(!dim){
+                                                    dim = posUserRes.data[i].orgDim;
+                                                }
+                                                if(posUserRes.data[i].orgDim==dim){
+                                                    orgTreeId += ","+posUserRes.data[i].orgId;
+                                                }
                                             }
                                         }
+                                        if(orgTreeId.length>0){
+                                            orgTreeId = orgTreeId.substring(1);
+                                        }
+                                        vm.$set(vm.treeRequestParam,"orgParentTreeSelfs",orgTreeId);
+                                        vm.init(dim);
+                                    }else{
+                                        vm.noAuth = true; // 查不到组织架构
                                     }
-                                    if(orgTreeId.length>0){
-                                        orgTreeId = orgTreeId.substring(1);
-                                    }
-                                    vm.$set(vm.treeRequestParam,"orgParentTreeSelfs",orgTreeId);
-                                    vm.init(dim);
-                                }else{
-                                    vm.noAuth = true; // 查不到组织架构
-                                }
-                                let filterOrgType = sysParams.filterOrgType;
-                                if(filterOrgType){
-                                    vm.$set(vm.treeRequestParam,"orgType",filterOrgType);
-                                }
-                            })
+                                })
+                            }
                         }
                     }
                 });