瀏覽代碼

12.31,部分主页的显示判断

Crazy 5 月之前
父節點
當前提交
3a8fd7fda3

+ 0 - 4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/StudentAttendanceCollegeTemplateVO.java

@@ -52,8 +52,4 @@ public class StudentAttendanceCollegeTemplateVO {
         return supervisor == null ? "无" : supervisor;
     }
 
-    public void setSupervisor(String supervisor) {
-        this.supervisor = supervisor;
-    }
-
 }

+ 2 - 2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java

@@ -27,7 +27,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(DeptDO::getAddress,reqVO.getAddress());//地址
-        if (reqVO.getLeaderUserId() != null && !reqVO.getLeaderUserId().equals("")) {
+        if (reqVO.getLeaderUserId() != null) {
             queryWrapperX.apply("JSON_CONTAINS(leader_user_id, CAST({0} AS JSON))", reqVO.getLeaderUserId());
         }
         return selectList(queryWrapperX);
@@ -41,7 +41,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(DeptDO::getAddress,reqVO.getAddress());//地址
-        if (reqVO.getLeaderUserId() != null && !reqVO.getLeaderUserId().equals("")) {
+        if (reqVO.getLeaderUserId() != null) {
             queryWrapperX.apply("JSON_CONTAINS(leader_user_id, CAST({0} AS JSON))", reqVO.getLeaderUserId());
         }
         return selectPage(reqVO,queryWrapperX);

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentAttendance/StudentAttendanceServiceImpl.java

@@ -165,7 +165,7 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
     public List<StudentAttendanceDO> getStudentAttendanceErrorListForTeacher(StudentAttendancePageReqVO pageReqVO) {
 
         List<StudentAttendanceDO> result =studentAttendanceMapper.selectErrorListForTeacher(pageReqVO);
-
+        System.out.println(result);
         result.stream().forEach(attendanceDO-> {
             if (attendanceDO.getSupervisorId()!=null){
                 AdminUserDO supervisorUser = adminUserService.getUser(attendanceDO.getSupervisorId());