Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -64,18 +64,18 @@ public class BaseStudentAssessmentInspectionController {
     @SaCheckPermission("basestudentassessmentinspection:detail")
     public RT<PageOutput<BaseStudentAssessmentInspectionPageVo>> page(@Valid BaseStudentAssessmentInspectionPageDto dto){
 
-        //未传流程状态不返回数据
-        if(ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getStatus())){
-            PageOutput<BaseStudentAssessmentInspectionPageVo> result = ConventPage.getPageOutputNull(BaseStudentAssessmentInspectionPageVo.class);
-            return RT.ok(result);
-        }
+//        //未传流程状态不返回数据
+//        if(ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getStatus())){
+//            PageOutput<BaseStudentAssessmentInspectionPageVo> result = ConventPage.getPageOutputNull(BaseStudentAssessmentInspectionPageVo.class);
+//            return RT.ok(result);
+//        }
         IPage<BaseStudentAssessmentInspectionPageVo> page = baseStudentAssessmentInspectionService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentAssessmentInspectionPageVo.class,
                 MPJWrappers.<BaseStudentAssessmentInspection>lambdaJoin()
                 .like(StrUtil.isNotEmpty(dto.getCreateUserName()), XjrUser::getName, dto.getCreateUserName())
                 .like(StrUtil.isNotEmpty(dto.getModifyUserName()), XjrUser::getName, dto.getModifyUserName())
-                .eq(BaseStudentAssessmentInspection::getStatus, dto.getStatus())
                 .eq(StrUtil.isNotEmpty(dto.getEnrollType()), BaseClass::getEnrollType, dto.getEnrollType())
                 .eq(ObjectUtil.isNotNull(dto.getGradeId()), BaseClass::getGradeId, dto.getGradeId())
+                .eq(BaseStudentAssessmentInspection::getStatus, 1)
                 .in(ObjectUtil.isNotNull(dto.getBaseStudentAssessmentProjectIds()), BaseStudentAssessmentInspection::getBaseStudentAssessmentProjectId, dto.getBaseStudentAssessmentProjectIds())
                 .between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), BaseStudentAssessmentInspection::getCreateDate,dto.getStartDate(),dto.getEndDate())
                 .in(ObjectUtil.isNotNull(dto.getBaseStudentAssessmentProjectIds()), BaseStudentAssessmentInspection::getBaseStudentAssessmentProjectId, dto.getBaseStudentAssessmentProjectIds())

src/main/java/com/xjrsoft/module/student/controller/BaseStudentCadreController.java

@@ -205,7 +205,7 @@ public class BaseStudentCadreController {
                 .eq(BaseStudentCadre::getPostId, dto.getPostId())
         );
         if(ObjectUtil.isNotNull(one)){
-            RT.ok("该学生已有该职务，无法重复添加");
+            return RT.error("该学生已有该职务，无法重复添加");
         }
 
         BaseStudentSchoolRoll baseStudentSchoolRoll = baseStudentSchoolRollMapper.selectOne(Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, dto.getUserId()));
@@ -222,8 +222,13 @@ public class BaseStudentCadreController {
     @ApiOperation(value = "修改学生干部状态（离职、复职）")
     @SaCheckPermission("basestudentcadre:edit")
     public RT<Boolean> editStatus(@Valid @RequestBody UpdateBaseStudentCadreDto dto){
-        if(ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getId()) || ObjectUtil.isNull(dto.getId()) || ObjectUtil.isNull(dto.getLeaveTime())){
-            return RT.error("请传入id、status和leaveTime");
+        if(ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getId()) || ObjectUtil.isNull(dto.getStatus()) ||
+                (dto.getStatus() != null && dto.getStatus() == 1 && ObjectUtil.isNull(dto.getLeaveTime()))){
+            String msg = "请传入id、status";
+            if(dto.getStatus() != null && dto.getStatus() == 1 && ObjectUtil.isNull(dto.getLeaveTime())){
+                msg = "请传入id、status和leaveTime";
+            }
+            return RT.error(msg);
         }
 
         BaseStudentCadre baseStudentCadre = BeanUtil.toBean(dto, BaseStudentCadre.class);