修改校产测试bug

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentLedgerController.java

@@ -136,7 +136,6 @@ public class EquipmentLedgerController extends BaseController {
      */
     @GetMapping("/getUser")
     public TableDataInfo getUser(SysUser sysUser){
-        startPage();
         return getDataTable(equipmentLedgerService.getUser(sysUser));
     }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/CirculationMapper.java

@@ -19,6 +19,14 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
     List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo);
 
     /**
+     * 查看个人设备借出归还列表
+     * @param schoolCirculationVo
+     * @return
+     */
+    List<SchoolCirculationVo> selectSchoolCirculationVoListGr(SchoolCirculationVo schoolCirculationVo);
+
+
+    /**
      * 查看设备借出归还详细信息
      * @param id
      * @return
@@ -45,4 +53,6 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
   @Select("SELECT sc.id,el.encode,sc.equipment_id,el.equipment_name,el.model,sc.borrow_time,sc.borrow_by_id,sc.borrow_by,sc.purpose,sc.deadline,sc.return_state,el.is_lend,sc.return_time,sc.return_equipment_condition,sc.received_by_id,sc.received_by,sc.yjuse_time,sc.sjuse_time,sc.remark from school_equipment_ledger el LEFT JOIN school_circulation sc on el.id = sc.equipment_id \n"
       + "WHERE  el.encode = #{encode}   AND sc.return_state=0 and el.del_flag=0")
   SchoolCirculationVo getSchoolCirculationVoByenCode(@Param("encode")String encode);
+
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentLedgerMapper.java

@@ -29,4 +29,10 @@ public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger>
      */
     List<Map<String, String>> getUser(SysUser sysUser);
 
+    /**
+     * 查看个人设备台账列表
+     * @param schoolEquipmentLedgerVo
+     * @return
+     */
+    List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerListGr(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java

@@ -69,4 +69,10 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
      */
     List<Map<String, String>> getRepair();
 
+  /**
+   * 查看个人设备报修列表
+   * @param schoolEquipmentRepairVo
+   * @return
+   */
+    List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoListGr(SchoolEquipmentRepairVo schoolEquipmentRepairVo);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/InStockMapper.java

@@ -20,4 +20,11 @@ public interface InStockMapper extends BaseMapper<SchoolInStock> {
      * @return
      */
     SchoolInStockVo selectSchoolInStockVoById(Long id);
+
+    /**
+     * 查看个人设备入库列表
+     * @param schoolInStockVo
+     * @return
+     */
+    List<SchoolInStockVo> selectSchoolInStockVoListGr(SchoolInStockVo schoolInStockVo);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/OutStockMapper.java

@@ -21,4 +21,11 @@ public interface OutStockMapper extends BaseMapper<SchoolOutStock> {
      * @return
      */
     SchoolOutStockVo selectSchoolOutStockVoById(Long id);
+
+    /**
+     * 查看个人设备出库列表
+     * @param schoolOutStockVo
+     * @return
+     */
+    List<SchoolOutStockVo> selectSchoolOutStockVoListGr(SchoolOutStockVo schoolOutStockVo);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/ProductCategoryMapper.java

@@ -43,4 +43,25 @@ public interface ProductCategoryMapper extends BaseMapper<SchoolProductCategory>
      * @return
      */
     List<Map<String, String>> getAdmin(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 查询个人产品分类列表
+     * @param schoolProductCategory
+     * @return
+     */
+    List<SchoolProductCategory> selectSchoolProductCateGoryGr(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 获取个人设备分类下拉框
+     * @param schoolProductCategory
+     * @return
+     */
+    List<Map<String, String>> getEquipmentTypeGr(SchoolProductCategory schoolProductCategory);
+
+    /**
+     * 获取管理员
+     * @param schoolProductCategory
+     * @return
+     */
+    List<Map<String, String>> getAdminGr(SchoolProductCategory schoolProductCategory);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/ReceiveMapper.java

@@ -27,4 +27,11 @@ public interface ReceiveMapper extends BaseMapper<SchoolReceive> {
      * @return
      */
     int deleteSchoolReceiveByIds(Long[] ids);
+
+    /**
+     * 查看个人设备领用列表
+     * @param schoolReceiveVo
+     * @return
+     */
+    List<SchoolReceiveVo> selectSchoolReceiveVoListGr(SchoolReceiveVo schoolReceiveVo);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -14,6 +16,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
+import java.util.ArrayList;
 import java.util.List;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
 
@@ -48,9 +51,26 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
-        return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
+        List<SchoolCirculationVo> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolCirculationVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = circulationMapper.selectSchoolCirculationVoListGr(schoolCirculationVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
+            }
+        }
+        return list;
     }
   public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(
       SchoolReceiveQuery schoolReceiveQuery) {

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java

@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.base.BaseException;
@@ -19,6 +20,7 @@ import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -44,9 +46,26 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) {
-        return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
+        List<SchoolEquipmentLedger> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolEquipmentLedgerVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = equipmentLedgerMapper.selectSchoolEquipmentLedgerListGr(schoolEquipmentLedgerVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
+            }
+        }
+        return list;
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -16,6 +17,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
@@ -35,9 +37,26 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) {
-        return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
+        List<SchoolEquipmentRepairVo> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolEquipmentRepairVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = equipmentRepairMapper.selectSchoolEquipmentRepairVoListGr(schoolEquipmentRepairVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
+            }
+        }
+        return list;
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/InStockServiceImpl.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,6 +12,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IInStockService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolInStockVo;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -24,9 +27,26 @@ public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) {
-        return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
+        List<SchoolInStockVo> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolInStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = inStockMapper.selectSchoolInStockVoListGr(schoolInStockVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
+            }
+        }
+        return list;
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/OutStockServiceImpl.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,6 +12,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.OutStockMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IOutStockService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolOutStockVo;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -24,9 +27,26 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutSt
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) {
-        return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
+        List<SchoolOutStockVo> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolOutStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = outStockMapper.selectSchoolOutStockVoListGr(schoolOutStockVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
+            }
+        }
+        return list;
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ProductCategoryServiceImpl.java

@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -15,6 +17,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.ProductCategoryMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IProductCategoryService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolProductCategoryVo;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,9 +35,26 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory) {
-        return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
+        List<SchoolProductCategory> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = productCategoryMapper.selectSchoolProductCateGoryGr(schoolProductCategory);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
+            }
+        }
+        return list;
     }
 
     /**
@@ -57,8 +77,7 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
     public int insertSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
         //查询分类编码是否重复
         LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SchoolProductCategory::getClassificationCode,schoolProductCategory.getClassificationCode())
-                .eq(SchoolProductCategory::getDelFlag,"0");
+        wrapper.eq(SchoolProductCategory::getClassificationCode,schoolProductCategory.getClassificationCode());
         List<SchoolProductCategory> schoolProductCategories = productCategoryMapper.selectList(wrapper);
         if (schoolProductCategories != null && schoolProductCategories.size() > 0){
             throw new ServiceException("该分类编码已存在");
@@ -118,9 +137,26 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<Map<String, String>> getEquipmentType(SchoolProductCategory schoolProductCategory) {
-        return productCategoryMapper.getEquipmentType(schoolProductCategory);
+        List<Map<String, String>> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  productCategoryMapper.getEquipmentType(schoolProductCategory);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = productCategoryMapper.getEquipmentTypeGr(schoolProductCategory);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  productCategoryMapper.getEquipmentType(schoolProductCategory);
+            }
+        }
+        return list;
     }
 
     /**
@@ -128,9 +164,26 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<Map<String, String>> getAdmin(SchoolProductCategory schoolProductCategory) {
-        return productCategoryMapper.getAdmin(schoolProductCategory);
+        List<Map<String, String>> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  productCategoryMapper.getAdmin(schoolProductCategory);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = productCategoryMapper.getAdminGr(schoolProductCategory);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  productCategoryMapper.getAdmin(schoolProductCategory);
+            }
+        }
+        return list;
     }
 
     /**
@@ -140,8 +193,35 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
      */
     @Override
     public SchoolProductCategory getEquipmentByCode(String code) {
+        List<SchoolProductCategory> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list.clear();
+                LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(SchoolProductCategory::getClassificationCode,code);
+                list.add(productCategoryMapper.selectOne(wrapper));
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                list.clear();
+                LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(SchoolProductCategory::getClassificationCode,code)
+                        .eq(SchoolProductCategory::getAdminId,SecurityUtils.getLoginUser().getUser().getUserId());
+                list.add(productCategoryMapper.selectOne(wrapper));
+                if (list.size() <= 0){
+                    throw new ServiceException("该设备不再您管辖范围内");
+                }
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list.clear();
                 LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(SchoolProductCategory::getClassificationCode,code);
-        return productCategoryMapper.selectOne(wrapper);
+                list.add(productCategoryMapper.selectOne(wrapper));
+            }
+        }
+        return list.get(0);
     }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java

@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -16,6 +18,7 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.ReceiveMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -34,9 +37,26 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
      * @return
      */
     @Override
-    @DataScope(userAlias = "u")
+//    @DataScope(userAlias = "u")
     public List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo) {
-        return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
+        List<SchoolReceiveVo> list = new ArrayList<>();
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("admin")){
+                list =  receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
+                break;
+            }else if (role.getRoleKey().equals("productCategoryAdmin")){
+                schoolReceiveVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
+                list = receiveMapper.selectSchoolReceiveVoListGr(schoolReceiveVo);
+            }
+        }
+        if (roles.size() <= 0){
+            if (user.isAdmin()){
+                list =  receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
+            }
+        }
+        return list;
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolCirculationVo.java

@@ -23,6 +23,8 @@ public class SchoolCirculationVo extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentLedgerVo.java

@@ -23,6 +23,8 @@ public class SchoolEquipmentLedgerVo extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 自编码 */
     @Excel(name = "自编码")
     private String encode;

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentRepairVo.java

@@ -23,6 +23,8 @@ public class SchoolEquipmentRepairVo extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolInStockVo.java

@@ -24,6 +24,8 @@ public class SchoolInStockVo extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolOutStockVo.java

@@ -23,6 +23,8 @@ public class SchoolOutStockVo extends OurBaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolReceiveVo.java

@@ -22,6 +22,8 @@ public class SchoolReceiveVo extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long adminId;
+
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.xml

@@ -63,8 +63,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
         <if test="borrowTime != null and borrowTime != ''">and DATE_FORMAT(c.borrow_time,,'%Y-%m-%d') = #{borrowTime}</if>
         <if test="borrowById != null and borrowById != ''">and c.borrow_by_id = #{borrowById}</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolCirculationVoListGr" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult">
+        SELECT
+        c.id,
+        c.equipment_id,
+        el.encode,
+        el.equipment_name,
+        el.model,
+        c.return_state,
+        c.borrow_time,
+        c.borrow_by_id,
+        c.borrow_by,
+        c.purpose,
+        c.deadline,
+        c.return_time,
+        c.return_equipment_condition,
+        c.received_by_id,
+        c.received_by,
+        c.yjuse_time,
+        c.sjuse_time,
+        c.remark,
+        c.create_by,
+        c.create_time,
+        c.update_by,
+        c.update_time
+        FROM
+        school_circulation c
+        LEFT JOIN school_equipment_ledger el ON c.equipment_id = el.id
+        LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+        LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+        c.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="borrowTime != null and borrowTime != ''">and DATE_FORMAT(c.borrow_time,,'%Y-%m-%d') = #{borrowTime}</if>
+        <if test="borrowById != null and borrowById != ''">and c.borrow_by_id = #{borrowById}</if>
     </select>
 
     <select id="selectSchoolCirculationVoById" parameterType="Long" resultMap="schoolCirculationVoResult">

smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentLedgerMapper.xml

@@ -42,8 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
         <if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if>
         <if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolEquipmentLedgerListGr" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult">
+        select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit,el.affiliation_type,el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production,
+        el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time
+        from school_equipment_ledger el
+        left join school_product_category pc on el.classification_code = pc.classification_code
+        left join sys_user u on pc.admin_id = u.user_id
+        where
+        el.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if>
+        <if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if>
     </select>
 
     <update id="outSchoolEquipmentLedger" parameterType="String">

smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.xml

@@ -65,11 +65,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
             <if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if>
             <if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
     </select>
 
-
+    <select id="selectSchoolEquipmentRepairVoListGr" parameterType="SchoolEquipmentRepairVo" resultMap="schoolEquipmentRepairVoResult">
+        SELECT
+        er.id,
+        er.equipment_id,
+        el.encode,
+        el.equipment_name,
+        el.model,
+        el.date_of_production,
+        el.place,
+        el.classification_code,
+        er.report_repair_time,
+        er.report_repair_id,
+        er.report_repair,
+        er.problem,
+        er.repair_id,
+        er.repair_name,
+        er.repair_phone,
+        er.repair_time,
+        er.repair_state,
+        er.dispose_state,
+        er.evaluate,
+        er.remark
+        FROM
+        school_equipment_repair er
+        LEFT JOIN school_equipment_ledger el ON er.equipment_id = el.id
+        LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+        LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+        er.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if>
+        <if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if>
+    </select>
 
 
     <select id="getMaintenanceUserList" parameterType="SchoolReceiveQuery" resultMap="schoolEquipmentRepairVoResult">

smart-campus/src/main/resources/mapper/schoolEquipment/InStockMapper.xml

@@ -67,8 +67,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
         <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
         <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolInStockVoListGr" parameterType="SchoolInStockVo" resultMap="schoolInStockVoResult">
+        SELECT
+        i.id,
+        i.equipment_id,
+        i.in_stock_type,
+        i.in_stock_time,
+        el.encode,
+        el.equipment_name,
+        el.model,
+        el.specification,
+        el.classification_code,
+        el.unit,
+        el.affiliation_type,
+        el.equipment_state,
+        el.date_of_production,
+        el.price,
+        el.life_of_utility,
+        el.place,
+        el.use_id,
+        el.use_name,
+        i.remark,
+        i.create_by,
+        i.create_time,
+        i.update_by,
+        i.update_time
+        FROM
+        school_in_stock i
+        LEFT JOIN school_equipment_ledger el ON i.equipment_id = el.id
+        LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+        LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+        i.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
+        <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
     </select>
 
     <select id="selectSchoolInStockVoById" parameterType="Long" resultMap="schoolInStockVoResult">

smart-campus/src/main/resources/mapper/schoolEquipment/OutStockMapper.xml

@@ -67,8 +67,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
         <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
         <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolOutStockVoListGr" parameterType="SchoolOutStockVo" resultMap="schoolOutStockVoResult">
+        SELECT
+        o.id,
+        o.equipment_id,
+        o.out_stock_type,
+        o.out_stock_time,
+        el.encode,
+        el.equipment_name,
+        el.model,
+        el.specification,
+        el.classification_code,
+        el.unit,
+        el.affiliation_type,
+        el.equipment_state,
+        el.date_of_production,
+        el.price,
+        el.life_of_utility,
+        el.place,
+        el.use_id,
+        el.use_name,
+        o.remark,
+        o.create_by,
+        o.create_time,
+        o.update_by,
+        o.update_time
+        FROM
+        school_out_stock o
+        LEFT JOIN school_equipment_ledger el ON o.equipment_id = el.id
+        LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+        LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+        o.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
+        <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
+        <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
     </select>
 
     <select id="selectSchoolOutStockVoById" parameterType="Long" resultMap="schoolOutStockVoResult">

smart-campus/src/main/resources/mapper/schoolEquipment/ProductCategoryMapper.xml

@@ -63,8 +63,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null">and (pc.id = #{id} or FIND_IN_SET(#{id},pc.ancestors))</if>
         <if test="model != null and model != ''">and pc.model like concat('%', #{model}, '%')</if>
         <if test="classificationCode != null and classificationCode != ''">and pc.classification_code like concat('%', #{classificationCode}, '%')</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        order by order_num ASC
+    </select>
+
+    <select id="selectSchoolProductCateGoryGr" parameterType="yangtz.cs.liu.campus.domain.schoolEquipment.SchoolProductCategory" resultMap="schoolProductCategoryResult">
+        SELECT
+        pc.id,
+        pc.classification_code,
+        pc.parent_id,
+        pc.ancestors,
+        pc.equipment_type,
+        pc.model,
+        pc.rank,
+        pc.order_num,
+        pc.admin_id,
+        pc.admin,
+        pc.create_by,
+        pc.create_time,
+        pc.update_by,
+        pc.update_time
+        FROM
+        sys_user u
+        LEFT JOIN school_product_category pc ON u.user_id = pc.admin_id
+        WHERE
+        pc.del_flag = '0' and u.user_id = #{adminId}
+        <if test="id != null">and (pc.id = #{id} or FIND_IN_SET(#{id},pc.ancestors))</if>
+        <if test="model != null and model != ''">and pc.model like concat('%', #{model}, '%')</if>
+        <if test="classificationCode != null and classificationCode != ''">and pc.classification_code like concat('%', #{classificationCode}, '%')</if>
         order by order_num ASC
     </select>
 
@@ -75,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <delete id="deleteSchoolProductCategory" parameterType="Long">
-        update school_product_category set del_flag = '1' where id = #{id} or FIND_IN_SET(#{id},ancestors)
+        delete from school_product_category where id = #{id} or FIND_IN_SET(#{id},ancestors)
     </delete>
 
     <select id="getEquipmentType" parameterType="SchoolProductCategory" resultType="Map">
@@ -83,8 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from  sys_user u
         left join school_product_category pc on pc.admin_id = u.user_id
         where pc.parent_id = 0 and pc.del_flag = '0'
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="getEquipmentTypeGr" parameterType="SchoolProductCategory" resultType="Map">
+        select pc.id as id,pc.equipment_type as equipmentType
+        from  sys_user u
+        left join school_product_category pc on pc.admin_id = u.user_id
+        where pc.parent_id = 0 and pc.del_flag = '0' and u.user_id = #{adminId}
     </select>
 
     <select id="getAdmin" resultType="Map" parameterType="SchoolProductCategory">
@@ -98,7 +128,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             r.role_key = "productCategoryAdmin"
         <if test="admin != null and admin != ''">and u.user_name like concat('%', #{admin}, '%')</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
+
+    <select id="getAdminGr" resultType="Map" parameterType="SchoolProductCategory">
+        SELECT
+        u.user_id as adminId,
+        u.user_name as admin
+        FROM
+        sys_user u
+        LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+        LEFT JOIN sys_role r ON ur.role_id = r.role_id
+        WHERE
+        r.role_key = "productCategoryAdmin" and u.user_id = #{adminId}
+        <if test="admin != null and admin != ''">and u.user_name like concat('%', #{admin}, '%')</if>
+    </select>
+
+
 </mapper>

smart-campus/src/main/resources/mapper/schoolEquipment/ReceiveMapper.xml

@@ -57,8 +57,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             r.del_flag = '0'
         <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
         <if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+    </select>
+
+    <select id="selectSchoolReceiveVoListGr" parameterType="SchoolReceiveVo" resultMap="schoolReceiveVoResult">
+        SELECT
+        r.id,
+        r.equipment_id,
+        el.encode,
+        el.equipment_name,
+        el.model,
+        r.recipient_time,
+        r.recipient_by_id,
+        r.recipient_by,
+        r.return_time,
+        r.return_equipment_condition,
+        r.received_by_id,
+        r.received_by,
+        r.yjuse_time,
+        r.sjuse_time,
+        r.remark,
+        r.create_by,
+        r.create_time,
+        r.update_by,
+        r.update_time
+        FROM
+        school_receive r
+        LEFT JOIN school_equipment_ledger el ON r.equipment_id = el.id
+        LEFT JOIN school_product_category pc ON el.classification_code = pc.classification_code
+        LEFT JOIN sys_user u ON pc.admin_id = u.user_id
+        WHERE
+        r.del_flag = '0' and u.user_id = #{adminId}
+        <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
+        <if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if>
     </select>
 
     <select id="selectSchoolReceiveVoById" parameterType="Long" resultMap="schoolReceiveVoResult">