Administrator 1 жил өмнө
parent
commit
e89dc1ac68

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: 智能校管家
+  name: zhinengxiaoguanjia
   # 版本
   version: ${revision}
   # 版权年份

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataDetailServiceImpl.java

@@ -65,8 +65,8 @@ public class ScoreDataDetailServiceImpl implements IScoreDataDetailService {
         lqw.like(StringUtils.isNotBlank(bo.getScoreDataName()), ScoreDataDetail::getScoreDataName, bo.getScoreDataName());
         lqw.eq(bo.getScoreDataNameId() != null, ScoreDataDetail::getScoreDataNameId, bo.getScoreDataNameId());
         lqw.eq(StringUtils.isNotBlank(bo.getXueke()), ScoreDataDetail::getXueke, bo.getXueke());
-        lqw.eq(StringUtils.isNotBlank(bo.getScore()), ScoreDataDetail::getScore, bo.getScore());
-        lqw.eq(StringUtils.isNotBlank(bo.getManfen()), ScoreDataDetail::getManfen, bo.getManfen());
+        lqw.eq(bo.getScore() != null, ScoreDataDetail::getScore, bo.getScore());
+        lqw.eq(bo.getManfen() != null, ScoreDataDetail::getManfen, bo.getManfen());
         return lqw;
     }
 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataStudentServiceImpl.java

@@ -65,7 +65,7 @@ public class ScoreDataStudentServiceImpl implements IScoreDataStudentService {
         lqw.eq(StringUtils.isNotBlank(bo.getScoreSort()), ScoreDataStudent::getScoreSort, bo.getScoreSort());
         lqw.like(StringUtils.isNotBlank(bo.getScoreDataName()), ScoreDataStudent::getScoreDataName, bo.getScoreDataName());
         lqw.eq(bo.getScoreDataNameId() != null, ScoreDataStudent::getScoreDataNameId, bo.getScoreDataNameId());
-        lqw.eq(StringUtils.isNotBlank(bo.getZongfen()), ScoreDataStudent::getZongfen, bo.getZongfen());
+        lqw.eq(bo.getZongfen() != null, ScoreDataStudent::getZongfen, bo.getZongfen());
         lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreDataStudent::getAvg, bo.getAvg());
         lqw.eq(StringUtils.isNotBlank(bo.getDetailsType()), ScoreDataStudent::getDetailsType, bo.getDetailsType());
         return lqw;