From 8753583e94b9a31feda420c69c3b0542804546be Mon Sep 17 00:00:00 2001
From: hezi66677 <847517741@qq.com>
Date: Thu, 19 Dec 2024 23:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/Mydoctor.java     | 14 +++++++++++++-
 .../resources/mapper/system/MydoctorMapper.xml     |  8 +++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Mydoctor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Mydoctor.java
index 71c89c6..89dbe03 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Mydoctor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Mydoctor.java
@@ -38,7 +38,17 @@ public class Mydoctor extends BaseEntity
     @Excel(name = "科室id")
     private Long administrativeofficeid;
 
-    public void setId(Long id) 
+    private Myadministrativeoffice myadministrativeoffice;
+
+    public Myadministrativeoffice getMyadministrativeoffice() {
+		return myadministrativeoffice;
+	}
+
+    public void setMyadministrativeoffice(Myadministrativeoffice myadministrativeoffice) {
+		this.myadministrativeoffice = myadministrativeoffice;
+	}
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -104,4 +114,6 @@ public class Mydoctor extends BaseEntity
             .append("administrativeofficeid", getAdministrativeofficeid())
             .toString();
     }
+
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/MydoctorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/MydoctorMapper.xml
index 8258f6d..6aabb95 100644
--- a/ruoyi-system/src/main/resources/mapper/system/MydoctorMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/MydoctorMapper.xml
@@ -11,10 +11,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="job"    column="job"    />
         <result property="intro"    column="intro"    />
         <result property="administrativeofficeid"    column="administrativeofficeid"    />
+        <association property="myadministrativeoffice" javaType="Myadministrativeoffice" column="administrativeofficeid">
+            <result property="administrativeoffice"    column="administrativeoffice"    />
+        </association>
     </resultMap>
 
     <sql id="selectMydoctorVo">
-        select id, medicname, administrativeoffice, job, intro, administrativeofficeid from mydoctor
+        SELECT mydoctor.id,mydoctor.medicname,mydoctor.job,mydoctor.intro,myadministrativeoffice.administrativeoffice
+        from mydoctor
+                 LEFT JOIN myadministrativeoffice
+                           ON mydoctor.administrativeofficeid=myadministrativeoffice.id
     </sql>
 
     <select id="selectMydoctorList" parameterType="Mydoctor" resultMap="MydoctorResult">