From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index e8d9a19..9e69bb6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -57,10 +58,17 @@
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/companys/save")
public R save(@RequestBody Companys companys) {
+ if (Objects.isNull(companys.getName())) {
+ throw new CoolException("浼佷笟鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(companys.getBreifCode())) {
+ throw new CoolException("浼佷笟鍔╄鐮佷笉鑳戒负绌�!!");
+ }
+ if (Objects.isNull(companys.getType())) {
+ throw new CoolException("浼佷笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
companys.setCreateBy(getLoginUserId());
- companys.setCreateTime(new Date());
companys.setUpdateBy(getLoginUserId());
- companys.setUpdateTime(new Date());
if (!companysService.save(companys)) {
return R.error("Save Fail");
}
@@ -106,7 +114,13 @@
@PreAuthorize("hasAuthority('manager:companys:list')")
@PostMapping("/companys/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(companysService.list(), Companys.class), response);
+ List<Companys> companies = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ companies = companysService.list(new LambdaQueryWrapper<Companys>().in(Companys::getId, map.get("ids")));
+ } else {
+ companies = companysService.list();
+ }
+ ExcelUtil.build(ExcelUtil.create(companies, Companys.class), response);
}
}
--
Gitblit v1.9.1