页面调整+权限问题

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/CenterdataTFarmCesspitCollectServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.digitalagriculture.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmCesspitCollect;
@@ -28,6 +29,7 @@ public class CenterdataTFarmCesspitCollectServiceImpl extends BaseServiceImpl im
      * @return 粪污收集点集合
      */
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTFarmCesspitCollect> selectCenterdataTFarmCesspitCollectList(CenterdataTFarmCesspitCollect centerdataTFarmCesspitCollect) {
         setSookaDataBase(centerdataTFarmCesspitCollect);
         return centerdataTFarmCesspitCollectMapper.selectCenterdataTFarmCesspitCollectList(centerdataTFarmCesspitCollect);

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/ICenterdataTFarmGarbageTransferServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.digitalagriculture.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmGarbageTransfer;
@@ -19,6 +20,7 @@ public class ICenterdataTFarmGarbageTransferServiceImpl extends BaseServiceImpl
         private CenterdataTFarmGarbageTransferMapper centerdataTFarmGarbageTransferMapper;
 
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTFarmGarbageTransfer> selectCenterdataTFarmGarbageTransferList(CenterdataTFarmGarbageTransfer centerdataTFarmGarbageTransfer) {
         setSookaDataBase(centerdataTFarmGarbageTransfer);
         return centerdataTFarmGarbageTransferMapper.selectCenterdataTFarmGarbageTransferList(centerdataTFarmGarbageTransfer);

src/main/resources/mapper/digitalagriculture/centerdataTFarmCesspitCollectMapper.xml

@@ -24,10 +24,13 @@
         from centerdata_t_farm_cesspit_collect a
     </sql>
     <select id="selectCenterdataTFarmCesspitCollectList" parameterType="CenterdataTFarmCesspitCollect" resultMap="CenterdataTFarmCesspitCollectResult">
-        <include refid="selectCenterdataTFarmCesspitCollectVo"/>
-       <where>
-           <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
-       </where>
+        select a.id, a.name, a.longitude, a.latitude, a.code, a.coverage, a.create_by, a.create_name, a.create_time,a.update_by, a.update_name, a.update_time, a.dept_id ,a.dept_name
+        from centerdata_t_farm_cesspit_collect a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+        <where>
+            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
+            ${params.dataScope}
+        </where>
         order by a.create_time desc
     </select>