From eb622551df4a2cae7c13987612d2a51cdeed8d44 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Thu, 11 Jan 2024 16:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E7=A6=BE=E4=BA=8C=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/controller/CarbonEmissionController.java | 8 -------- .../lims/controller/CarbonEmissionPlanController.java | 8 -------- .../lims/controller/CarbonIntensityController.java | 8 -------- .../lims/service/impl/CarbonEmissionPlanServiceImpl.java | 3 --- .../lims/service/impl/CarbonEmissionServiceImpl.java | 3 --- .../lims/service/impl/CarbonIntensityServiceImpl.java | 3 --- 6 files changed, 33 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionController.java index 85462af..13cda45 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionController.java @@ -7,16 +7,12 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.lims.entry.CarbonEmission; import org.springblade.lims.service.ICarbonEmissionService; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; - /** * @author sjx @@ -32,10 +28,6 @@ public class CarbonEmissionController extends BladeController { @GetMapping("/page") public R page(CarbonEmission entry, Query query) { - List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); - if(!roles.contains("admin") && !roles.contains("政府")){ - entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); - } return R.data(service.findPage(entry, query)); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionPlanController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionPlanController.java index cf7c307..3b09dc7 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionPlanController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonEmissionPlanController.java @@ -7,16 +7,12 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.lims.entry.CarbonEmissionPlan; import org.springblade.lims.service.ICarbonEmissionPlanService; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; - /** * @author sjx @@ -32,10 +28,6 @@ public class CarbonEmissionPlanController extends BladeController { @GetMapping("/page") public R page(CarbonEmissionPlan entry, Query query) { - List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); - if(!roles.contains("admin") && !roles.contains("政府")){ - entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); - } return R.data(service.findPage(entry, query)); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonIntensityController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonIntensityController.java index ffb5c0f..bc4669a 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonIntensityController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/CarbonIntensityController.java @@ -7,16 +7,12 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.lims.entry.CarbonIntensity; import org.springblade.lims.service.ICarbonIntensityService; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; - /** * @author sjx @@ -32,10 +28,6 @@ public class CarbonIntensityController extends BladeController { @GetMapping("/page") public R page(CarbonIntensity entry, Query query) { - List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); - if(!roles.contains("admin") && !roles.contains("政府")){ - entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); - } return R.data(service.findPage(entry, query)); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionPlanServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionPlanServiceImpl.java index 0a63162..f06d447 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionPlanServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionPlanServiceImpl.java @@ -34,9 +34,6 @@ public class CarbonEmissionPlanServiceImpl extends BaseServiceImpl page = this.page(Condition.getPage(query), wrapper); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionServiceImpl.java index 96ddf19..253fd5f 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionServiceImpl.java @@ -40,9 +40,6 @@ public class CarbonEmissionServiceImpl extends BaseServiceImpl page = this.page(Condition.getPage(query), wrapper); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonIntensityServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonIntensityServiceImpl.java index 02fc9b3..5ca78c5 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonIntensityServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonIntensityServiceImpl.java @@ -40,9 +40,6 @@ public class CarbonIntensityServiceImpl extends BaseServiceImpl page = this.page(Condition.getPage(query), wrapper);