From a93536179220aefafdb6004de64afceabfd55344 Mon Sep 17 00:00:00 2001
From: sikadi <13315935+sikadi_love@user.noreply.gitee.com>
Date: Sat, 25 Nov 2023 18:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fate/firm/domain/request/FirmRequest.java   | 4 ++--
 .../main/java/com/fate/firm/controller/FirmController.java    | 4 ++--
 .../main/java/com/fate/firm/service/impl/FirmServiceImpl.java | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
index 574242a..41d332a 100644
--- a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
+++ b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
@@ -24,8 +24,8 @@ import java.util.Date;
 @AllArgsConstructor
 public class FirmRequest {
 
-    @Excel(name = "企业主键", cellType = Excel.ColumnType.NUMERIC)
-    @TableId(type = IdType.AUTO)
+    @Excel(name = "企业主键")
+    @TableField("firm_id")
     private Integer firmId;
 
     @Excel(name = "企业名称")
diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
index 1a5a9f7..0c5c4ff 100644
--- a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
+++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
@@ -26,7 +26,7 @@ import java.util.List;
  * @since 2023-11-18 06:27:02
  */
 @RestController
-@RequestMapping("/firm")
+    @RequestMapping("/firm")
 @Log4j2
 @Master
 public class FirmController extends BaseController {
@@ -46,7 +46,7 @@ public class FirmController extends BaseController {
      * @return: com.fate.common.core.domain.Result
      **/
     @PostMapping("/addFirm")
-    public Result addFirm(@RequestBody @Validated FirmRequest firmRequest) {
+    public Result addFirm(@RequestBody  FirmRequest firmRequest) {
         Result result = firmService.addFirm(Firm.addReqBuild(firmRequest));
         return Result.success("成功");
     }
diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java
index de49a63..c938da8 100644
--- a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java
+++ b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java
@@ -210,7 +210,9 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
         List<SysRole> roles = SecurityUtils.getLoginUser().getSysUser().getRoles();
         Long role = 0L;
         roles.forEach(item -> {
-
+            if (item.getRoleId() == 1) {
+                // 执行相关操作
+            }
         });
         return null;
     }