From 97a9c6f1f80ed09198a9157588d6d3a6b9059ccc Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Fri, 24 Apr 2020 15:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/StaffGridListDTO.java  |  5 ++++
 .../controller/DepartmentController.java      | 30 +++++++++++++++++++
 .../resources/mapper/CustomerStaffDao.xml     |  3 +-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffGridListDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffGridListDTO.java
index dc25ece228..263405df0c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffGridListDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffGridListDTO.java
@@ -31,4 +31,9 @@ public class StaffGridListDTO {
      */
     private String roleName;
 
+    /**
+     * 性别
+     */
+    private String gender;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
new file mode 100644
index 0000000000..9a0a04187b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
@@ -0,0 +1,30 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AddDepartmentFormDTO;
+import com.epmet.service.CustomerStaffDepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Auther zxc
+ * @Create 2020-04-24 14:48
+ */
+@RestController
+@RequestMapping(value = "/department")
+public class DepartmentController {
+
+    @Autowired
+    private CustomerStaffDepartmentService customerStaffDepartmentService;
+
+    @PostMapping(value = "adddepartmentstaff")
+    public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentFormDTO addDepartmentFormDTO){
+        return null;
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 0e596339f9..33c42ff406 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -30,7 +30,8 @@
             cs.id AS staffId,
             cs.real_name AS staffName,
             cs.head_photo AS staffHeadPhoto,
-            gsr.role_name AS roleName
+            gsr.role_name AS roleName,
+            cs.gender
         FROM
             customer_staff cs
         LEFT JOIN gov_staff_role gsr ON cs.user_id = gsr.id