修改

zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkRescueSupplies.java

@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import zhsq_qk.common.annotation.Excel;
 import zhsq_qk.common.core.domain.BaseEntity;
+import zhsq_qk.common.core.domain.entity.SysDept;
 
 /**
  * 防汛抗旱物资储备对象 qk_rescue_supplies
@@ -60,6 +61,18 @@ public class QkRescueSupplies extends BaseEntity {
      */
     private Long deptId;
 
+
+
+    private SysDept deptOne;
+
+    public SysDept getDeptOne() {
+        return deptOne;
+    }
+
+    public void setDeptOne(SysDept deptOne) {
+        this.deptOne = deptOne;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

zhsq_qk-system/src/main/resources/mapper/system/QkRescueSuppliesMapper.xml

@@ -13,11 +13,34 @@
             <result property="remarks" column="remarks"/>
             <result property="longitude" column="longitude"/>
             <result property="latitude" column="latitude"/>
+        <association property="deptOne" javaType="SysDept" resultMap="deptResult"/>
+    </resultMap>
+
+    <resultMap id="deptResult" type="SysDept">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
     </resultMap>
 
     <sql id="selectQkRescueSuppliesVo">
-        select id, varieties, cost, remarks, longitude, latitude,dept
-        from qk_rescue_supplies
+        SELECT
+            s.id,
+            s.dept_id,
+            s.varieties,
+            s.cost,
+            s.remarks,
+            s.longitude,
+            s.latitude,
+            s.dept,
+            d.dept_id,
+            d.dept_name
+        FROM
+            qk_rescue_supplies s
+                LEFT JOIN sys_dept d ON s.dept_id = d.dept_id
     </sql>
 
     <select id="selectQkRescueSuppliesList" parameterType="QkRescueSupplies" resultMap="QkRescueSuppliesResult">