bug修复

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -146,7 +146,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                 .selectSum(EvaluateExecuter::getStatus, ResultViewingPageVo::getActualExecuterNum)//这里值得推敲
                 .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateExecuter::getEvaluateObjectId)
                 .eq(EvaluateExecuter::getEvaluateManageId, dto.getEvaluateManageId())
-                .in(EvaluateObject::getObjectId, evaluateObjectIdList)
+                .in(!evaluateObjectIdList.isEmpty(), EvaluateObject::getObjectId, evaluateObjectIdList)
                 .groupBy(EvaluateObject::getObjectId)
                 .disableSubLogicDel();
         List<ResultViewingPageVo> planAndActualExecuterNum = evaluateExecuterMapper.selectJoinList(ResultViewingPageVo.class, evaluateExecuterMPJLambdaWrapper);

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

@@ -59,6 +59,7 @@ public class BaseStudentDevelopmentController {
         queryWrapper
                 .eq(BaseStudentDevelopment::getBaseStudentGraduateId, dto.getBaseStudentGraduateId())
                     .orderByDesc(BaseStudentDevelopment::getId)
+                .select(BaseStudentDevelopment::getId)
                 .select(BaseStudentDevelopment.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentDevelopmentPageVo.class).contains(x.getProperty()));
         IPage<BaseStudentDevelopment> page = developmentService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentDevelopmentPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentDevelopmentPageVo.class);

src/main/resources/mapper/student/PbVXsxxsfytbMapper.xml

@@ -55,7 +55,7 @@
         GROUP BY t2.name
     </select>
     <select id="stduyStatusStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
-        SELECT replace(t2.name,'住校','住读'),COUNT(t1.credential_number) as count FROM xjr_user t1
+        SELECT replace(t2.name,'住校','住读') as name,COUNT(t1.credential_number) as count FROM xjr_user t1
         INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
         left JOIN xjr_dictionary_detail t2 ON t3.stduy_status = t2.code and t2.item_id = 2023000000000000030
         WHERE t3.delete_mark = 0