From 8735f748d52e79c50ed0c512dc52a562280fd8e7 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Mon, 6 Jun 2022 13:53:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E7=AB=AF=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=B8=88=E5=82=85=E6=9C=8D=E5=8A=A1=E5=95=86=E3=80=81?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/worker/WorkerController.java  | 2 +-
 ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java    | 3 +++
 ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index 4c462325..bc827753 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -47,7 +47,7 @@ public class WorkerController extends BaseController {
     public AjaxResult updateWorker(@RequestBody Worker worker){
         try {
             workerService.updateWorker(worker);
-            return AjaxResult.success("");
+            return AjaxResult.success("修改成功");
         }catch (Exception e){
             logger.error(ExceptionUtil.getExceptionMessage(e));
             return AjaxResult.error(e.getMessage());
diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index 7785ec2d..3f098a77 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -28,6 +28,9 @@ public class Worker extends BaseEntity {
     @Excel(name = "密码", cellType = Excel.ColumnType.STRING)
     private String password;
 
+    @Excel(name = "0 服务商 1供应商", cellType = Excel.ColumnType.NUMERIC)
+    private Integer type;
+
     @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING)
     private String openId;
 
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index bc6a2132..ddeb13fc 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -10,6 +10,7 @@
         <result property="openId"              column="open_id"     />
         <result property="password"              column="password"     />
         <result property="status"              column="status"     />
+        <result property="type"              column="type"     />
         <result property="deptName"             column="dept_name"/>
         <result property="deptId"             column="dept_id"/>
         <result property="workerLogoUrl"     column="worker_logo_url"     />
@@ -25,7 +26,7 @@
     <sql id="selectWorker">
         SELECT
             w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, w.status, w.worker_logo_url,
-            w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark
+            w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type
         FROM worker w
         LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id
     </sql>
@@ -74,6 +75,7 @@
     <update id="updateWorker" >
         update worker
         <set>
+            <if test="type != null"> type = #{type},</if>
             <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>