Merge commit '8d9602f1d94e386ea887513a07c47839a7dc78a0' into suda

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSparseHardwareServiceImpl.java

@@ -46,7 +46,6 @@ public class LabSparseHardwareServiceImpl implements ILabSparseHardwareService {
      * @return 疏散硬件
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "t", permi = PerPrefix.LABORATORY_SPARSEHARDWARE)
     public List<LabSparseHardware> selectLabSparseHardwareList(LabSparseHardware labSparseHardware) {
         return labSparseHardwareMapper.selectLabSparseHardwareList(labSparseHardware);
     }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSparseHardwareMapper.xml

@@ -98,8 +98,6 @@
             <if test="deptId != null  and deptId != ''">and t.dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''">and t.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null ">and t.user_id = #{userId}</if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         order by t.create_time desc
     </select>