From ef6776fec72a98bba4159910a922c5a5f733a9d8 Mon Sep 17 00:00:00 2001
From: DengMin <16679070171@qq.com>
Date: Tue, 22 Feb 2022 16:34:57 +0800
Subject: [PATCH] 换办公室1.0

---
 src/main/java/com/subsidy/controller/MemberController.java | 4 ++--
 src/main/java/com/subsidy/vo/member/GetAllVO.java          | 2 ++
 src/main/resources/mapper/FileDictMapper.xml               | 2 +-
 src/main/resources/mapper/MemberMapper.xml                 | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/subsidy/controller/MemberController.java b/src/main/java/com/subsidy/controller/MemberController.java
index b418212..da6c573 100644
--- a/src/main/java/com/subsidy/controller/MemberController.java
+++ b/src/main/java/com/subsidy/controller/MemberController.java
@@ -54,14 +54,14 @@ public class MemberController {
     }
 
     @PostMapping("addMember")
-    @ApiOperation("新增成员 companyId userName accountName telephone gender image idCard departmentIds jobIds")
+    @ApiOperation("新增成员 companyId userName accountName accountNameEn telephone gender image idCard departmentIds jobIds")
     @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO addMember(@RequestBody AddMemberDTO addMemberDTO){
         return ResponseData.generateCreatedResponse(0,memberService.addMember(addMemberDTO));
     }
 
     @PostMapping("updateMember")
-    @ApiOperation("编辑成员 {id companyId userName accountName telephone gender image idCard status departmentIds jobIds}")
+    @ApiOperation("编辑成员 {id companyId userName accountName accountNameEn telephone gender image idCard status departmentIds jobIds}")
     @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO updateMember(@RequestBody AddMemberDTO addMemberDTO){
         return ResponseData.generateCreatedResponse(0,memberService.updateMember(addMemberDTO));
diff --git a/src/main/java/com/subsidy/vo/member/GetAllVO.java b/src/main/java/com/subsidy/vo/member/GetAllVO.java
index 9d7eeb9..73f78fe 100644
--- a/src/main/java/com/subsidy/vo/member/GetAllVO.java
+++ b/src/main/java/com/subsidy/vo/member/GetAllVO.java
@@ -16,6 +16,8 @@ public class GetAllVO {
 
     private String accountName;
 
+    private String accountNameEn;
+
     private String userName;
 
     private String telephone;
diff --git a/src/main/resources/mapper/FileDictMapper.xml b/src/main/resources/mapper/FileDictMapper.xml
index 238fac6..1a0fd0c 100644
--- a/src/main/resources/mapper/FileDictMapper.xml
+++ b/src/main/resources/mapper/FileDictMapper.xml
@@ -36,7 +36,7 @@
             file_dict t
         WHERE
             t.delete_date IS NULL
-            AND t.content_id = 2
+            AND t.content_id = #{contentId}
             AND t.file_name LIKE concat('%',#{fileName} ,'%')
     </select>
 
diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml
index 80ddb67..4ff0e05 100644
--- a/src/main/resources/mapper/MemberMapper.xml
+++ b/src/main/resources/mapper/MemberMapper.xml
@@ -165,6 +165,7 @@
         t2.id,
         t2.user_name,
         t2.account_name,
+        t2.account_name_en,
         t2.telephone,
         t2.gender,
         t2.id_card,
--
libgit2 0.25.0