Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-system-service/pom.xml

@@ -18,10 +18,10 @@
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.xwy</groupId>-->
+<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
+<!--        </dependency>-->
 
         <!-- 添加公共模块依赖 -->
         <dependency>

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -262,7 +262,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
             MtCompanyUser mtCompanyUser = mtCompanyUserService.getOne(new QueryWrapper<MtCompanyUser>()
                     .eq("mt_company_id", userApplyRequest.getCompanyId())
                     .eq("user_id", userApplyRequest.getUserId())
-                    .ne("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
+                    .eq("status", ApiConstants.ApplicationConstants.APPLY_PASS)
             );
             if (mtCompanyUser != null) {
                 return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户已经在团队中了");

lift-system-service/src/main/resources/application.yml

@@ -1,5 +1,7 @@
 server:
   port: 20230
+  tomcat:
+    basedir: /Users/huangyuan/application/tomcat/data
 
 # mybatis-plus配置
 mybatis-plus:
@@ -10,7 +12,7 @@ spring:
   application:
     name: lift-system-service
   profiles:
-    active: prod
+    active: web
 
 #自动添加createTime、isDelete 等字段
 xwy: