From 43c5aa63efb2e11857cd90cffe1d126e24091336 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 20 Oct 2025 15:54:07 +0800
Subject: [PATCH] fix(ai): 调整公司成员申请状态处理逻辑

---
 src/main/resources/templates/febs/views/modules/ai/aiApply/list.html              |   12 ++++++------
 src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java |   19 +++++++++++++++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java
index 052ac17..45c770e 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java
@@ -94,6 +94,13 @@
             throw new FebsException("公司编码不存在");
         }
 
+        this.update(
+                null,
+                Wrappers.lambdaUpdate(AiCompanyMemberApply.class)
+                        .set(AiCompanyMemberApply::getState, 1)
+                        .eq(AiCompanyMemberApply::getId, id)
+        );
+
         String memberUuid = aiCompanyMemberApply.getMemberId();
         String companyId = aiCompany.getId();
 
@@ -123,7 +130,7 @@
         }
         this.update(null,
                 Wrappers.lambdaUpdate(AiCompanyMemberApply.class)
-                .set(AiCompanyMemberApply::getState, 3)
+                .set(AiCompanyMemberApply::getState, 2)
                 .eq(AiCompanyMemberApply::getId, id)
         );
         return new FebsResponse().success();
@@ -136,7 +143,7 @@
         if (ObjectUtil.isEmpty(aiCompanyMemberApply)){
             throw new RuntimeException("申请不存在");
         }
-        if (0 != aiCompanyMemberApply.getState()){
+        if (1 != aiCompanyMemberApply.getState()){
             throw new RuntimeException("申请已处理");
         }
         String companyCode = aiCompanyMemberApply.getCompanyCode();
@@ -150,9 +157,13 @@
             throw new FebsException("公司编码不存在");
         }
 
-        String memberUuid = aiCompanyMemberApply.getMemberId();
-        String companyId = aiCompany.getId();
+        this.update(null,
+                Wrappers.lambdaUpdate(AiCompanyMemberApply.class)
+                        .set(AiCompanyMemberApply::getState, 3)
+                        .eq(AiCompanyMemberApply::getId, id)
+        );
 
+        String memberUuid = aiCompanyMemberApply.getMemberId();
         mallMemberMapper.update(null,
                 Wrappers.lambdaUpdate(MallMember.class)
                         .set(MallMember::getCompanyId, null)
diff --git a/src/main/resources/templates/febs/views/modules/ai/aiApply/list.html b/src/main/resources/templates/febs/views/modules/ai/aiApply/list.html
index 44e5fab..d988d16 100644
--- a/src/main/resources/templates/febs/views/modules/ai/aiApply/list.html
+++ b/src/main/resources/templates/febs/views/modules/ai/aiApply/list.html
@@ -103,18 +103,21 @@
                     }
                 });
             } else if (layEvent === 'aiApplyInfoAgreeEvent') {
+                febs.modal.confirm('删除', '确认删除?', function () {
+                    memberRoleDeleteEvent(data.id);
+                });
                 // 同意操作
-                febs.confirm('确定要同意该申请吗?', function () {
+                febs.modal.confirm('审核','确定要同意该申请吗?', function () {
                     handleApplyAction(data.id, 'agree');
                 });
             } else if (layEvent === 'aiApplyInfoDisagreeEvent') {
                 // 拒绝操作
-                febs.confirm('确定要拒绝该申请吗?', function () {
+                febs.modal.confirm('审核','确定要拒绝该申请吗?', function () {
                     handleApplyAction(data.id, 'disagree');
                 });
             } else if (layEvent === 'aiApplyInfoUnbindEvent') {
                 // 解绑操作
-                febs.confirm('确定要解除绑定吗?此操作不可撤销!', function () {
+                febs.modal.confirm('审核','确定要解除绑定吗?此操作不可撤销!', function () {
                     handleApplyAction(data.id, 'unbind');
                 });
             }
@@ -132,9 +135,6 @@
                 data: JSON.stringify({id: id}),
                 dataType: 'json',
                 headers: {'Content-Type': 'application/json;charset=utf-8'},
-                beforeSend: function() {
-                    febs.loading.show();
-                },
                 success: function(res) {
                     if (res.code === 200) {
                         febs.alert.success(actionName + '成功');

--
Gitblit v1.9.1