Merge branch 'local/share_1008' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantMemberController.java

@@ -71,48 +71,58 @@ public class TenantMemberController extends BaseController {
     @PostMapping("/add")
     public HttpResponseResult add(@Valid @RequestBody TenantMemberWrapper.InsertOrUpdateTenantMember tenantMember) throws IOException {
 
-        File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
-        tenantMember.setFile(file);
-        InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
-
-        try {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
+        if (tenantMember.getMultipartFile() != null) {
+            File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
+            tenantMember.setFile(file);
+            InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
+
+            try {
+                if (!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+                FileOutputStream fos = new FileOutputStream(file);
+                IOUtils.copy(inputStream, fos);
+                // 新增数据
+                return HttpResponseResult.succeed(tenantMemberService.add(tenantMember));
+            } catch (Exception e) {
+                return failed(e.getMessage());
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+                FileUtils.deleteQuietly(file);
             }
-            FileOutputStream fos = new FileOutputStream(file);
-            IOUtils.copy(inputStream, fos);
-            // 新增数据
-            return HttpResponseResult.succeed(tenantMemberService.add(tenantMember));
-        } catch (Exception e) {
-            return failed(e.getMessage());
-        } finally {
-            IOUtils.closeQuietly(inputStream);
-            FileUtils.deleteQuietly(file);
         }
+
+        // 新增数据
+        return HttpResponseResult.succeed(tenantMemberService.add(tenantMember));
     }
 
     @ApiOperation(value = "修改", notes = "机构子账户表- 传入 TenantMemberWrapper.InsertTenantMember")
     @PreAuthorize("@pcs.hasPermissions('tenantMember/update', {'BACKEND'})")
     @PostMapping("/update")
     public HttpResponseResult update(@RequestBody TenantMemberWrapper.InsertOrUpdateTenantMember tenantMember) throws IOException {
-        File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
-        tenantMember.setFile(file);
-        InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
-
-        try {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
+        if (tenantMember.getMultipartFile() != null) {
+            File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
+            tenantMember.setFile(file);
+            InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
+
+            try {
+                if (!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+                FileOutputStream fos = new FileOutputStream(file);
+                IOUtils.copy(inputStream, fos);
+                // 新增数据
+                return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
+            } catch (Exception e) {
+                return failed(e.getMessage());
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+                FileUtils.deleteQuietly(file);
             }
-            FileOutputStream fos = new FileOutputStream(file);
-            IOUtils.copy(inputStream, fos);
-            // 新增数据
-            return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
-        } catch (Exception e) {
-            return failed(e.getMessage());
-        } finally {
-            IOUtils.closeQuietly(inputStream);
-            FileUtils.deleteQuietly(file);
         }
+
+        // 新增数据
+        return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
     }
 
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantMemberController.java

@@ -102,24 +102,29 @@ public class TenantMemberController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('tenantMember/update', {'BACKEND'})")
     @PostMapping("/update")
     public HttpResponseResult update(@RequestBody TenantMemberWrapper.InsertOrUpdateTenantMember tenantMember) throws IOException {
-        File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
-        tenantMember.setFile(file);
-        InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
+        if (tenantMember.getMultipartFile() != null) {
+            File file = new File("/var/tmp/" + tenantMember.getMultipartFile().getOriginalFilename());
+            tenantMember.setFile(file);
+            InputStream inputStream = tenantMember.getMultipartFile().getInputStream();
 
-        try {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
+            try {
+                if (!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+                FileOutputStream fos = new FileOutputStream(file);
+                IOUtils.copy(inputStream, fos);
+                // 新增数据
+                return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
+            } catch (Exception e) {
+                return failed(e.getMessage());
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+                FileUtils.deleteQuietly(file);
             }
-            FileOutputStream fos = new FileOutputStream(file);
-            IOUtils.copy(inputStream, fos);
-            // 新增数据
-            return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
-        } catch (Exception e) {
-            return failed(e.getMessage());
-        } finally {
-            IOUtils.closeQuietly(inputStream);
-            FileUtils.deleteQuietly(file);
         }
+
+        // 新增数据
+        return HttpResponseResult.succeed(tenantMemberService.update(tenantMember));
     }