补充发件人信息

src/main/java/cn/com/tenlion/systemoa/controller/app/api/mail/MailAppController.java

@@ -212,9 +212,10 @@ public class MailAppController extends DefaultBaseController {
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("get-app-recover-del-mail/{ids}")
-    public void getAppRecoverDelMail(@RequestHeader("token") String token,
+    public SuccessResult getAppRecoverDelMail(@RequestHeader("token") String token,
                                               @PathVariable("ids") String ids){
         mailService.getRecoverDelMail(ids);
+        return new SuccessResult();
     }
 
     @ApiOperation(value = "删除-发件箱邮件", notes = "删除-发件箱邮件")
@@ -224,9 +225,10 @@ public class MailAppController extends DefaultBaseController {
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @DeleteMapping("delete-app-send-mail/{ids}")
-    public void deleteAppSendMail(@RequestHeader("token") String token,
+    public SuccessResult deleteAppSendMail(@RequestHeader("token") String token,
                                            @PathVariable("ids") String ids){
         mailService.deleteAppSendMail(token, ids);
+        return new SuccessResult();
     }
 
     @ApiOperation(value = "删除-收件箱邮件", notes = "删除-收件箱邮件")
@@ -236,9 +238,10 @@ public class MailAppController extends DefaultBaseController {
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @DeleteMapping("delete-app-inbox-mail/{ids}")
-    public void deleteAppInboxMail(@RequestHeader("token") String token,
+    public SuccessResult deleteAppInboxMail(@RequestHeader("token") String token,
                                             @PathVariable("ids") String ids){
         mailService.deleteAppInboxMail(token, ids);
+        return new SuccessResult();
     }
 
     @ApiOperation(value = "删除-草稿箱邮件", notes = "删除-草稿箱邮件")
@@ -247,9 +250,10 @@ public class MailAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "ids", value = "取mailId,多个mailId用逗号拼接", paramType = "path")
     })
     @DeleteMapping("delete-app-draft-mail/{ids}")
-    public void deleteAppDraftMail(@RequestHeader("token") String token,
+    public SuccessResult deleteAppDraftMail(@RequestHeader("token") String token,
                                             @PathVariable("ids") String ids){
         mailService.deleteAppDraftMail(token, ids);
+        return new SuccessResult();
     }
 
     @ApiOperation(value = "删除-垃圾箱邮件", notes = "删除-垃圾箱邮件")
@@ -258,9 +262,10 @@ public class MailAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "ids", value = "取id,多个id用逗号拼接", paramType = "path")
     })
     @DeleteMapping("delete-app-del-mail/{ids}")
-    public void deleteAppDelMail(@RequestHeader("token") String token,
+    public SuccessResult deleteAppDelMail(@RequestHeader("token") String token,
                                           @PathVariable("ids") String ids){
         mailService.deleteDelMail(ids);
+        return new SuccessResult();
     }
 
     @ApiOperation(value = "删除所有-垃圾箱邮件", notes = "删除所有-垃圾箱邮件")
@@ -268,8 +273,9 @@ public class MailAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "token", value = "token", paramType = "header")
     })
     @DeleteMapping("delete-app-del-mail-all")
-    public void deleteAppDelMailAll(@RequestHeader("token") String token){
+    public SuccessResult deleteAppDelMailAll(@RequestHeader("token") String token){
         mailService.deleteAppDelMailAll(token);
+        return new SuccessResult();
     }
 
 }

src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailDelDTO.java

@@ -45,7 +45,7 @@ public class MailDelDTO {
     private String creatorNames;
     @ApiModelProperty(name = "gmtCreate", value = "发件时间")
     private String gmtCreate;
-    @ApiModelProperty(name = "sourceFrom", value = "来源")
+    @ApiModelProperty(name = "sourceFrom", value = "来源(send:发件箱,inbox:收件箱,draft:草稿箱)")
     private String sourceFrom;
     @ApiModelProperty(name = "delUserId", value = "删除人")
     private String delUserId;

src/main/java/cn/com/tenlion/systemoa/service/mail/impl/MailServiceImpl.java

@@ -546,6 +546,9 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService
     @Override
     public MailDelDTO getAppDelMail(String token, Map<String, Object> params) {
         MailDelDTO dto = mailDao.getDelMail(params);
+        UserDTO userDTO = userService.get(dto.getCreator());
+        String creatorNames = userDTO.getUserUsername() + "[" + userDTO.getUserName() + "]";
+        dto.setCreatorNames(creatorNames);
         return dto;
     }
 

src/main/resources/mybatis/mapper/mail/mail-mapper.xml

@@ -183,37 +183,37 @@
     <update id="updateDraftMail" parameterType="map">
         UPDATE oa_mail_send_draft SET
             mail_id = #{mailId}
-        <if test="recipientIds != null and recipientIds != ''">
+        <if test="recipientIds != null">
             ,recipient_ids = #{recipientIds}
         </if>
-        <if test="recipientNames != null and recipientNames != ''">
+        <if test="recipientNames != null">
             ,recipient_names = #{recipientNames}
         </if>
-        <if test="copyForIds != null and copyForIds != ''">
+        <if test="copyForIds != null">
             ,copy_for_ids = #{copyForIds}
         </if>
-        <if test="copyForNames != null and copyForNames != ''">
+        <if test="copyForNames != null">
             ,copy_for_names = #{copyForNames}
         </if>
-        <if test="secretIds != null and secretIds != ''">
+        <if test="secretIds != null">
             ,secret_ids = #{secretIds}
         </if>
-        <if test="secretNames != null and secretNames != ''">
+        <if test="secretNames != null">
             ,secret_names = #{secretNames}
         </if>
-        <if test="title != null and title != ''">
+        <if test="title != null">
             ,title = #{title}
         </if>
-        <if test="mailFiles != null and mailFiles != ''">
+        <if test="mailFiles != null">
             ,mail_files = #{mailFiles}
         </if>
-        <if test="contentRich != null and contentRich != ''">
+        <if test="contentRich != null">
             ,content_rich = #{contentRich}
         </if>
-        <if test="content != null and content != ''">
+        <if test="content != null">
             ,content = #{content}
         </if>
-        <if test="gmtCreate != null and gmtCreate != ''">
+        <if test="gmtCreate != null">
             ,gmt_create = #{gmtCreate}
         </if>
         WHERE