Merge remote-tracking branch 'origin/main'

yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml

@@ -46,6 +46,11 @@
         use_status,
         deleted
     </sql>
+    <delete id="deleteById" parameterType="String">
+        delete
+        from farm_disaster_data
+        where id = #{id}
+    </delete>
 
     <!-- 分页查询 -->
     <select id="selectDisasterDataPage"
@@ -91,15 +96,6 @@
 
     </select>
 
-    <delete id="deleteByIds">
-
-    </delete>
-
-    <delete id="deleteById" parameterType="string">
-
-
-    </delete>
-
     <update id="updateById" parameterType="cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO">
         UPDATE farm_disaster_data
         <set>
@@ -211,7 +207,6 @@
     <select id="selectMore"
             parameterType="cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO"
             resultType="cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO">
-
         SELECT <include refid="all_fields"/> FROM farm_disaster_data
         <where>
             <if test="id != null and id != ''">AND id = #{id}</if>

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

@@ -15,4 +15,9 @@
         from system_users
         where mobile = #{phone}
     </select>
+    <select id="getTenantNameById" parameterType="java.lang.String" resultType="java.lang.String">
+        select name
+        from system_tenant
+        where id = #{tenantId}
+    </select>
 </mapper>