farm模块-字典完善

yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml

@@ -118,9 +118,7 @@
             <if test="status != null">
                 AND status = #{status}
             </if>
-            <if test="deleted != null">
-                AND deleted = #{deleted}
-            </if>
+                AND deleted = 0
         </where>
     </sql>
 

yudao-module-farm/src/main/resources/mapper/baseinfo/BaseInfoMapper.xml

@@ -13,5 +13,6 @@
         select count(*)
         from farm_base_info
         where tenant_id = #{tenantId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/farmingtypemaintenance/FarmingTypeMaintenanceMapper.xml

@@ -44,9 +44,7 @@
             <if test="req.useStatus != null">
                 AND t.use_status = #{req.useStatus}
             </if>
-            <if test="req.deleted != null">
-                AND t.deleted = #{req.deleted}
-            </if>
+            AND t.deleted = 0
         </where>
 
     </select>

yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml

@@ -14,5 +14,6 @@
         select *
         from farm_model_cycle
         where model_id = #{modelId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml

@@ -14,5 +14,6 @@
         select *
         from farm_model_environment_index
         where cycle_id = #{cycleId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml

@@ -11,6 +11,9 @@
 
     <select id="selectByCycleId" parameterType="String"
             resultType="cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO">
-
+        select *
+        from farm_model_farming_operation
+        where cycle_id = #{cycleId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml

@@ -14,5 +14,6 @@
         select *
         from farm_model_farming_operation_input
         where farming_id = #{farmingId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml

@@ -14,5 +14,6 @@
         select *
         from farm_model_pest_disease_weed
         where cycle_id = #{cycleId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml

@@ -14,5 +14,6 @@
         select *
         from farm_model_weather_disaster
         where cycle_id = #{cycleId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/personnelmanagement/PersonnelManagementMapper.xml

@@ -14,5 +14,6 @@
         from farm_personnel_management
         where tenant_id = #{tenantId}
           and account_status = 0
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml

@@ -13,10 +13,12 @@
         select count(plant_species_code)
         from farm_production_plan
         where tenant_id = #{tenantId}
+          and deleted = 0
     </select>
     <select id="getTotalArea" parameterType="Long" resultType="java.lang.Double">
         select sum(total_area)
         from farm_production_plan
         where tenant_id = #{tenantId}
+          and deleted = 0
     </select>
 </mapper>

yudao-module-farm/src/main/resources/mapper/speciesclassifylibrary/SpeciesClassifyLibraryMapper.xml

@@ -46,6 +46,7 @@
             <if test="req.useStatus != null">
                 AND t.use_status = #{req.useStatus}
             </if>
+            AND t.deleted = 0
         </where>
     </select>