换办公室1.0

src/main/java/com/subsidy/controller/MemberController.java

@@ -54,14 +54,14 @@ public class MemberController {
     }
     }
 
 
     @PostMapping("addMember")
     @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})
     @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO addMember(@RequestBody AddMemberDTO addMemberDTO){
     public ResponseVO addMember(@RequestBody AddMemberDTO addMemberDTO){
         return ResponseData.generateCreatedResponse(0,memberService.addMember(addMemberDTO));
         return ResponseData.generateCreatedResponse(0,memberService.addMember(addMemberDTO));
     }
     }
 
 
     @PostMapping("updateMember")
     @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})
     @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO updateMember(@RequestBody AddMemberDTO addMemberDTO){
     public ResponseVO updateMember(@RequestBody AddMemberDTO addMemberDTO){
         return ResponseData.generateCreatedResponse(0,memberService.updateMember(addMemberDTO));
         return ResponseData.generateCreatedResponse(0,memberService.updateMember(addMemberDTO));

src/main/java/com/subsidy/vo/member/GetAllVO.java

@@ -16,6 +16,8 @@ public class GetAllVO {
 
 
     private String accountName;
     private String accountName;
 
 
+    private String accountNameEn;
+
     private String userName;
     private String userName;
 
 
     private String telephone;
     private String telephone;

src/main/resources/mapper/FileDictMapper.xml

@@ -36,7 +36,7 @@
             file_dict t
             file_dict t
         WHERE
         WHERE
             t.delete_date IS NULL
             t.delete_date IS NULL
-            AND t.content_id = 2
+            AND t.content_id = #{contentId}
             AND t.file_name LIKE concat('%',#{fileName} ,'%')
             AND t.file_name LIKE concat('%',#{fileName} ,'%')
     </select>
     </select>
 
 

src/main/resources/mapper/MemberMapper.xml

@@ -165,6 +165,7 @@
         t2.id,
         t2.id,
         t2.user_name,
         t2.user_name,
         t2.account_name,
         t2.account_name,
+        t2.account_name_en,
         t2.telephone,
         t2.telephone,
         t2.gender,
         t2.gender,
         t2.id_card,
         t2.id_card,