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

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

@@ -78,7 +78,18 @@ public class ProjectService implements IProjectService {
 
     @Override
     public List<ProjectUser> getProjectUserList(PropertyUserRequest propertyUserRequest) {
-        return userAccountMapper.getProjectUserList(propertyUserRequest);
+        PropertyUserRequest queryPropertyUserRequest = new PropertyUserRequest();
+        queryPropertyUserRequest.setCompanyId(propertyUserRequest.getCompanyId());
+        queryPropertyUserRequest.setProjectId(propertyUserRequest.getProjectId());
+        queryPropertyUserRequest.setUserId(propertyUserRequest.getUserId());
+        queryPropertyUserRequest.setQueryCondition(propertyUserRequest.getQueryCondition());
+        queryPropertyUserRequest.setUserIdList(propertyUserRequest.getUserIdList());
+        queryPropertyUserRequest.setPageSize(propertyUserRequest.getPageSize());
+        long pageNum = propertyUserRequest.getPageNum();
+        if (pageNum > 0) {
+            queryPropertyUserRequest.setPageNum(pageNum - 1);
+        }
+        return userAccountMapper.getProjectUserList(queryPropertyUserRequest);
     }
 
     @Override

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

@@ -86,6 +86,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         List<UserApplication> userApplications = this.list(new QueryWrapper<UserApplication>()
                 .eq("mt_company_id", companyId)
                 .eq("user_id", applyUserId)
+                .eq(userApplyRequest.getProjectId() != null, "project_id", userApplyRequest.getProjectId())
                 //去掉申请未通过的判断
                 .ne("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
                 .orderByDesc("apply_date")
@@ -100,7 +101,6 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //设置前校验
 
         //校验通过设置审核信息
-
         UserApplication userApplication = new UserApplication();
         userApplication.setUserId(applyUserId);
         userApplication.setMtCompanyId(companyId);