嘉禾二期

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<Object> page(CarbonEmission entry, Query query) {
-        List<String> 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));
     }
 

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<Object> page(CarbonEmissionPlan entry, Query query) {
-        List<String> 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));
     }
 

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<Object> page(CarbonIntensity entry, Query query) {
-        List<String> 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));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionPlanServiceImpl.java

@@ -34,9 +34,6 @@ public class CarbonEmissionPlanServiceImpl extends BaseServiceImpl<CarbonEmissio
         if (StringUtils.isNotBlank(entry.getCurrentYear())) {
             wrapper.eq(CarbonEmissionPlan::getCurrentYear, entry.getCurrentYear());
         }
-        if(entry.getCreateDept() != null){
-            wrapper.eq(BaseEntity::getCreateDept,entry.getCreateDept());
-        }
         wrapper.eq(BaseEntity::getIsDeleted, 0);
         wrapper.orderByDesc(CarbonEmissionPlan::getCreateTime);
         IPage<CarbonEmissionPlan> page = this.page(Condition.getPage(query), wrapper);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonEmissionServiceImpl.java

@@ -40,9 +40,6 @@ public class CarbonEmissionServiceImpl extends BaseServiceImpl<CarbonEmissionMap
         if (StringUtils.isNotBlank(entry.getCurrentMonth())) {
             wrapper.eq(CarbonEmission::getCurrentMonth, entry.getCurrentMonth());
         }
-        if(entry.getCreateDept() != null){
-            wrapper.eq(BaseEntity::getCreateDept,entry.getCreateDept());
-        }
         wrapper.eq(BaseEntity::getIsDeleted, 0);
         wrapper.orderByDesc(CarbonEmission::getCreateTime);
         IPage<CarbonEmission> page = this.page(Condition.getPage(query), wrapper);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/CarbonIntensityServiceImpl.java

@@ -40,9 +40,6 @@ public class CarbonIntensityServiceImpl extends BaseServiceImpl<CarbonIntensityM
         if (StringUtils.isNotBlank(entry.getCurrentMonth())) {
             wrapper.eq(CarbonIntensity::getCurrentMonth, entry.getCurrentMonth());
         }
-        if(entry.getCreateDept() != null){
-            wrapper.eq(BaseEntity::getCreateDept,entry.getCreateDept());
-        }
         wrapper.eq(BaseEntity::getIsDeleted, 0);
         wrapper.orderByDesc(CarbonIntensity::getCreateTime);
         IPage<CarbonIntensity> page = this.page(Condition.getPage(query), wrapper);