Merge branch 'master' of https://gitee.com/op-souls/ghy-all

ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java

@@ -25,6 +25,10 @@ public class WorkerTeam extends BaseEntity {
     @Excel(name = "成员师傅备注", cellType = Excel.ColumnType.STRING)
     private String workerName;
 
+    private String name;
 
+    private String phone;
+
+    private String workerLogoUrl;
 
 }

ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml

@@ -76,6 +76,8 @@
         <set>
             <if test="account != null and account != ''"> account = #{account},</if>
             <if test="phone != null and phone != ''"> phone = #{phone},</if>
+            <if test="leaderTeamRate != null and leaderTeamRate != ''"> leader_team_rate = #{leaderTeamRate},</if>
+            <if test="leaderTeamMoney != null and leaderTeamMoney != ''"> leader_team_money = #{leaderTeamMoney},</if>
         </set>
         where worker_id = #{workerId}
     </update>

ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml

@@ -7,6 +7,9 @@
         <result property="leaderId"         column="leader_id"/>
         <result property="workerId"         column="worker_id"/>
         <result property="workerName"       column="worker_name"/>
+        <result property="name"       column="name"/>
+        <result property="workerLogoUrl"       column="worker_logo_url"/>
+        <result property="phone"       column="phone"/>
         <result property="createBy"         column="create_by"/>
         <result property="createTime"       column="create_time"/>
         <result property="updateBy"         column="update_by"/>
@@ -34,15 +37,16 @@
     </insert>
 
     <sql id="selectWorkerTeam">
-        SELECT *
+        SELECT wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url
-        FROM worker_team
+        FROM worker_team wt
+        left join worker w on wt.worker_id = w.worker_id
     </sql>
 
     <select id="getWorkerTeamList" resultMap="WorkerTeamResult">
         <include refid="selectWorkerTeam"/>
         <where>
             <if test="leaderId != null and leaderId != ''">
-                AND leader_id = #{leaderId}
+                AND wt.leader_id = #{leaderId}
             </if>
         </where>
     </select>