Commit a75ca6cf by 陶光胜

取数平台权限

parent d002b701
...@@ -15,7 +15,9 @@ import com.gic.cloud.data.hook.api.entity.Global; ...@@ -15,7 +15,9 @@ import com.gic.cloud.data.hook.api.entity.Global;
import com.gic.cloud.data.hook.api.service.IFlatQueryResultService; import com.gic.cloud.data.hook.api.service.IFlatQueryResultService;
import com.gic.cloud.data.hook.api.service.IFlatQueryTableService; import com.gic.cloud.data.hook.api.service.IFlatQueryTableService;
import com.gic.cloud.data.hook.api.service.IMyFlatQueryService; import com.gic.cloud.data.hook.api.service.IMyFlatQueryService;
import com.gic.enterprise.api.constant.StoreWidget;
import com.gic.enterprise.api.dto.EnterpriseSettingDTO; import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
import com.gic.enterprise.api.dto.StoreWidgetDTO;
import com.gic.enterprise.api.service.EnterpriseService; import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreWidgetService; import com.gic.enterprise.api.service.StoreWidgetService;
import com.gic.web.common.utils.SessionContextUtils; import com.gic.web.common.utils.SessionContextUtils;
...@@ -297,10 +299,13 @@ public class FlatQueryController { ...@@ -297,10 +299,13 @@ public class FlatQueryController {
EnterpriseSettingDTO setting = this.enterpriseService.getEnterpriseSettingByEnterpriseId(user.getEnterpriseId()); EnterpriseSettingDTO setting = this.enterpriseService.getEnterpriseSettingByEnterpriseId(user.getEnterpriseId());
if(setting.getEnableAccessControl() != null && setting.getEnableAccessControl() == 1) { if(setting.getEnableAccessControl() != null && setting.getEnableAccessControl() == 1) {
PowerClerkDTO clerkDetail = this.powerService.getClerkDetail(user.getUserId()); PowerClerkDTO clerkDetail = this.powerService.getClerkDetail(user.getUserId());
List<String> authStoreList = this.storeWidgetService.getStoreWidgetStore(clerkDetail.getStoreWidgetId(), user.getEnterpriseId(), null, null, null); StoreWidgetDTO widgetDTO = this.storeWidgetService.getStoreWidgetBykey(clerkDetail.getStoreWidgetId());
list.addAll(authStoreList); if(StoreWidget.ALL != widgetDTO.getSelectType()){
if(CollectionUtils.isEmpty(list)){ List<String> authStoreList = this.storeWidgetService.getStoreWidgetStore(clerkDetail.getStoreWidgetId(), user.getEnterpriseId(), null, null, null);
list.add("1"); list.addAll(authStoreList);
if(CollectionUtils.isEmpty(list)){
list.add("1");
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment