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

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -165,7 +165,7 @@ public class ProjectAppController {
      */
     @PostMapping("project/detail")
     @Validation(fields = {"id"})
-    public RestResponse detail(@Valid @RequestBody ProjectRequest request) {
+    public RestResponse detail(@Val @RequestBody ProjectRequest request) {
         ProjectDetailResponse response = projectAppService.detail(request);
         if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
@@ -285,7 +285,7 @@ public class ProjectAppController {
      * @date 2020/4/15 2:52 下午
      */
     @PostMapping("capital/attendance/list")
-    @Validation(fields = {"mtCompanyId", "userId", "projectStatus"})
+    @Validation(fields = {"mtCompanyId", "userId"})
     public RestResponse attendanceList(@Val @RequestBody CapitalRepairRequest request) {
         List<ProjectUserResponse> list = signInService.attendanceList(request);
         return RestResponse.success(list, MessageUtils.get("msg.query.success"));

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -228,9 +228,12 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public ProjectDetailResponse capitalDetail(CapitalRepairRequest request) {
         ProjectDetailResponse response = capitalRepairLiftRelevanceMapper.findProjectById(request);
         List<ProjectUserResponse> userList = projectUserService.getUserList(request.getId(), request.getMtCompanyId());
-        Stream<String> isMonitor = userList.stream().
-                filter(entry -> request.getUserId().equals(entry.getUserId())).map(ProjectUserResponse::getIsMonitor);
-        response.setIsMonitor(isMonitor.toString());
+        Optional<String> optional = userList.stream().
+                filter(entry -> request.getUserId().equals(entry.getUserId())).map(ProjectUserResponse::getIsMonitor).findFirst();
+        if (optional.isPresent()) {
+            String monitor = optional.get();
+            response.setIsMonitor(monitor);
+        }
         return response;
     }