|
@@ -83,29 +83,33 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
|
|
|
//申请人id
|
|
|
long applyUserId = userApplyRequest.getUserId();
|
|
|
//获取用户原有的申请信息
|
|
|
- UserApplication userApplication = this.getOne(new QueryWrapper<UserApplication>()
|
|
|
+ List<UserApplication> userApplications = this.list(new QueryWrapper<UserApplication>()
|
|
|
.eq("mt_company_id", companyId)
|
|
|
.eq("user_id", applyUserId)
|
|
|
//去掉申请未通过的判断
|
|
|
.ne("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
|
|
|
+ .orderByDesc("apply_date")
|
|
|
);
|
|
|
- //设置前校验
|
|
|
- RestResponse restResponse = applyCheck(userApplyRequest, userApplication, applyTypeTeam);
|
|
|
- if (restResponse != null) {
|
|
|
- //校验不通过返回校验信息
|
|
|
- return restResponse;
|
|
|
+ if (!userApplications.isEmpty()) {
|
|
|
+ RestResponse restResponse = applyCheck(userApplyRequest, userApplications.get(0), applyTypeTeam);
|
|
|
+ if (restResponse != null) {
|
|
|
+ //校验不通过返回校验信息
|
|
|
+ return restResponse;
|
|
|
+ }
|
|
|
}
|
|
|
+ //设置前校验
|
|
|
+
|
|
|
//校验通过设置审核信息
|
|
|
- if (userApplication == null) {
|
|
|
- userApplication = new UserApplication();
|
|
|
- userApplication.setUserId(applyUserId);
|
|
|
- userApplication.setMtCompanyId(companyId);
|
|
|
- userApplication.setType(applyTypeTeam);
|
|
|
- //设置审核描述信息
|
|
|
- userApplication.setDescription(userApplyRequest.getDescription());
|
|
|
- //申请加入项目时需要设置的信息
|
|
|
- userApplication.setProjectId(userApplyRequest.getProjectId());
|
|
|
- }
|
|
|
+
|
|
|
+ UserApplication userApplication = new UserApplication();
|
|
|
+ userApplication.setUserId(applyUserId);
|
|
|
+ userApplication.setMtCompanyId(companyId);
|
|
|
+ userApplication.setType(applyTypeTeam);
|
|
|
+ //设置审核描述信息
|
|
|
+ userApplication.setDescription(userApplyRequest.getDescription());
|
|
|
+ //申请加入项目时需要设置的信息
|
|
|
+ userApplication.setProjectId(userApplyRequest.getProjectId());
|
|
|
+
|
|
|
//审核状态变为待审核
|
|
|
userApplication.setStatus(ApiConstants.ApplicationConstants.APPLY_WAIT);
|
|
|
//申请加入项目时需要设置的信息
|