xiewj 2 years ago
parent
commit
ac68958ece

+ 0 - 1
src/main/java/com/fdkankan/site/controller/MarkingController.java

@@ -60,7 +60,6 @@ public class MarkingController  extends BaseController {
     @SaIgnore
     public ResultData list(@RequestBody MarkingSearchParam param){
         VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
-        VUtils.isTure(param.getNum() == null).throwMessage(ResultCode.PARAM_MISS);
         return ResultData.ok(markingService.pageList(param));
     }
     /**

+ 4 - 2
src/main/java/com/fdkankan/site/service/impl/MarkingServiceImpl.java

@@ -55,8 +55,10 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
         VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
         MPJLambdaWrapper<Marking> wrapper = new MPJLambdaWrapper<Marking>()
                 .selectAll(Marking.class)
-                .eq(Marking::getProjectId,param.getProjectId())
-                .eq(Marking::getNum,param.getNum());
+                .eq(Marking::getProjectId,param.getProjectId());
+        if (Optional.ofNullable(param.getNum()).isPresent()) {
+            wrapper.eq(Marking::getNum,param.getNum());
+        }
         if (Optional.ofNullable(param.getMarkingStatus()).isPresent()) {
             wrapper.eq(Marking::getMarkingStatus,param.getMarkingStatus());
         }

+ 1 - 1
src/main/java/com/fdkankan/site/service/impl/ProjectTeamServiceImpl.java

@@ -272,7 +272,7 @@ public class ProjectTeamServiceImpl extends ServiceImpl<IProjectTeamMapper, Proj
         LambdaUpdateWrapper<ProjectTeam> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ProjectTeam::getTeamId,param.getTeamId());
         boolean updateFlag=false;
-        if (StrUtil.isNotEmpty(param.getRemark())&&!projectTeam.getRemark().equals(param.getRemark())){
+        if (StrUtil.isNotEmpty(param.getRemark())){
             wrapper.set(ProjectTeam::getRemark,param.getRemark());
             updateFlag=true;
         }