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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/task/service/impl/TaskSchoolEvenServiceImpl.java

@@ -17,11 +17,13 @@
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.service.ITaskSchoolEvenService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import org.springblade.modules.task.vo.TaskSchoolEvenVO;
import org.springblade.modules.task.entity.TaskSchoolEvenEntity;
import org.springblade.modules.task.mapper.TaskSchoolEvenMapper;
@@ -49,7 +51,12 @@

   @Override
   public IPage<TaskSchoolEvenVO> selectTaskSchoolEvenPage(IPage<TaskSchoolEvenVO> page, TaskSchoolEvenVO taskSchoolEven) {
      return page.setRecords(baseMapper.selectTaskSchoolEvenPage(page, taskSchoolEven));
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskSchoolEvenVO.class, taskSchoolEven);
      if (taskSchoolEven.getRoleName() != null && (taskSchoolEven.getRoleName().equals("xyty"))) {
         taskSchoolEven.setCreateUser(AuthUtil.getUserId());
      }
      return page.setRecords(baseMapper.selectTaskSchoolEvenPage(page, taskSchoolEven,
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
   }

   @Override
@@ -58,4 +65,16 @@
      taskSchoolEvenVO.setConfirmUserId(AuthUtil.getUserId());
      return updateById(taskSchoolEvenVO);
   }

   @Override
   public int schoolEvenCount(TaskSchoolEvenVO taskSchoolEven) {
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskSchoolEvenVO.class, taskSchoolEven);
      return baseMapper.schoolEvenCount(taskSchoolEven,
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
   }

   @Override
   public TaskSchoolEvenVO selectTaskSchoolEvenDetail(TaskSchoolEvenVO taskSchoolEven) {
      return baseMapper.selectTaskSchoolEvenDetail(taskSchoolEven);
   }
}