bug修复及优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -77,7 +77,7 @@ public class SysOssController extends BaseController {
         SysOssVo oss = iSysOssService.upload(file);
         Map<String, String> map = new HashMap<>(2);
         map.put("url", oss.getUrl());
-        map.put("fileName", oss.getOriginalName());
+        map.put("fileName", oss.getFileName());
         map.put("ossId", oss.getOssId().toString());
         return R.ok(map);
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/CommercialController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.HashMap;
 import java.util.List;
@@ -44,7 +45,7 @@ public class CommercialController {
      * @return
      */
     @DeleteMapping("/deleteCommercial")
-    public R deleteCommercial(@NotEmpty String[] commercialIds){
+    public R deleteCommercial(@NotEmpty(message = "待删除商户Id不能为空") String[] commercialIds){
         String s = commericalService.deleteCommercial(commercialIds);
         return R.ok(s);
     }
@@ -55,7 +56,7 @@ public class CommercialController {
      * @return
      */
     @GetMapping("/getCommercial")
-    public R getCommercial(String commercialId){
+    public R getCommercial(@NotBlank(message = "商户Id不能为空") String commercialId){
         Commercial commercial = commericalService.getCommercial(commercialId);
         return R.ok(commercial);
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/CommercialBo.java

@@ -44,5 +44,6 @@ public class CommercialBo {
         this.prove5 = commercial.getProve5();
         this.addrCode = commercial.getAddrCode();
         this.addrInfo = commercial.getAddrInfo();
+        this.addrCodeInfo = commercial.getAddrCodeInfo();
     }
 }