From 5ae1d0ab3ed92c1949ad40113b60ad7c5f84d5ad Mon Sep 17 00:00:00 2001
From: kyle <573984425@qq.com>
Date: Tue, 16 Jan 2024 11:09:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D3=E5=A4=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题，导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
---
 .../flowable/config/YudaoFlowableConfiguration.java       | 4 ++--
 .../admin/socail/vo/user/SocialUserBindReqVO.java         | 3 +++
 .../yudao/module/system/convert/ip/AreaConvert.java       | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
index 6d657a1b4..859eca510 100644
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
@@ -17,8 +17,8 @@ public class YudaoFlowableConfiguration {
      *
      * 如果不创建，会导致项目启动时，Flowable 报错的问题
      */
-    @Bean
-    @ConditionalOnMissingBean
+    @Bean(name = "applicationTaskExecutor")
+    @ConditionalOnMissingBean(name = "applicationTaskExecutor")
     public AsyncListenableTaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(8);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java
index 5ed0042a8..815f367fa 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java
@@ -31,4 +31,7 @@ public class SocialUserBindReqVO {
     @NotEmpty(message = "state 不能为空")
     private String state;
 
+    public Integer getType() {
+        return type;
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java
index ae98bd25d..6ba76ef92 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java
@@ -17,4 +17,12 @@ public interface AreaConvert {
 
     List<AppAreaNodeRespVO> convertList3(List<Area> list);
 
+    /**
+     * 缺少单个转换
+     * @param value
+     * @return
+     */
+    AreaNodeRespVO map(Area value);
+
+    AppAreaNodeRespVO map3(Area value);
 }