Merge branch 'feature-bieao' of lift-manager/lift-server into develop

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -85,7 +86,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         if (ObjectUtil.isEmpty(entry))
             return RestResponse.success(null, MessageUtils.get("msg.user.not.exist"));
         //如果该成员是维保工，升级成维保班长，若该项目组成员还有其他维保班长，则该维保班长设置为维保工
-        if ("0".equals(entry.getIsMonitor())) {
+        if (Objects.equals("0", entry.getIsMonitor())) {
             //设置为维保班长
             entry.setIsMonitor("1");
             boolean result = update(entry, queryWrapper);
@@ -97,7 +98,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
             wrapper.eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
             List<ProjectUser> userList = list(wrapper);
             Optional<ProjectUser> first = userList.stream().filter(user ->
-                    !user.getUserId().equals(entry.getUserId()) && user.getIsMonitor().equals("1")).findFirst();
+                    !user.getUserId().equals(entry.getUserId()) && Objects.equals("1", user.getIsMonitor())).findFirst();
             if (first.isPresent()) {
                 ProjectUser user = first.get();
                 //设置另外的维保班长为维保工