diff --git a/src/main/java/club/joylink/rtss/dao/permission/PermissionDistributeDAO.java b/src/main/java/club/joylink/rtss/dao/permission/PermissionDistributeDAO.java deleted file mode 100644 index da714919e..000000000 --- a/src/main/java/club/joylink/rtss/dao/permission/PermissionDistributeDAO.java +++ /dev/null @@ -1,35 +0,0 @@ -package club.joylink.rtss.dao.permission; - -import java.util.List; - -import club.joylink.rtss.entity.permission.PermissionDistribute; -import club.joylink.rtss.entity.permission.PermissionDistributeExample; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -@Mapper -@Repository -public interface PermissionDistributeDAO { - long countByExample(PermissionDistributeExample example); - - int deleteByExample(PermissionDistributeExample example); - - int deleteByPrimaryKey(Long id); - - int insert(PermissionDistribute record); - - int insertSelective(PermissionDistribute record); - - List selectByExample(PermissionDistributeExample example); - - PermissionDistribute selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") PermissionDistribute record, @Param("example") PermissionDistributeExample example); - - int updateByExample(@Param("record") PermissionDistribute record, @Param("example") PermissionDistributeExample example); - - int updateByPrimaryKeySelective(PermissionDistribute record); - - int updateByPrimaryKey(PermissionDistribute record); -} diff --git a/src/main/java/club/joylink/rtss/services/paper/PagerQuestionService.java b/src/main/java/club/joylink/rtss/services/paper/PagerQuestionService.java index b4ce1a593..bb908f8d2 100644 --- a/src/main/java/club/joylink/rtss/services/paper/PagerQuestionService.java +++ b/src/main/java/club/joylink/rtss/services/paper/PagerQuestionService.java @@ -73,7 +73,7 @@ public class PagerQuestionService { for(var i = 0 ; i < tmpLableList.size();i++){ String data = tmpLableList.get(i); if(i != 0){ - sqlBuilder.append(" or "); + sqlBuilder.append(" and "); } sqlBuilder.append(String.format(" find_in_set('%s',tags) > 0 ",data)); } diff --git a/src/main/resources/mybatis/mapper/permission/PermissionDistributeDAO.xml b/src/main/resources/mybatis/mapper/permission/PermissionDistributeDAO.xml deleted file mode 100644 index 70957da70..000000000 --- a/src/main/resources/mybatis/mapper/permission/PermissionDistributeDAO.xml +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, permission_id, source_subject_id, amount, remains, forever, create_time, update_time, - start_time, end_time, create_id, dsc - - - - - delete from rts_permission_distribute - where id = #{id,jdbcType=BIGINT} - - - delete from rts_permission_distribute - - - - - - insert into rts_permission_distribute (permission_id, source_subject_id, amount, - remains, forever, create_time, - update_time, start_time, end_time, - create_id, dsc) - values (#{permissionId,jdbcType=BIGINT}, #{sourceSubjectId,jdbcType=BIGINT}, #{amount,jdbcType=INTEGER}, - #{remains,jdbcType=INTEGER}, #{forever,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, - #{createId,jdbcType=BIGINT}, #{dsc,jdbcType=VARCHAR}) - - - insert into rts_permission_distribute - - - permission_id, - - - source_subject_id, - - - amount, - - - remains, - - - forever, - - - create_time, - - - update_time, - - - start_time, - - - end_time, - - - create_id, - - - dsc, - - - - - #{permissionId,jdbcType=BIGINT}, - - - #{sourceSubjectId,jdbcType=BIGINT}, - - - #{amount,jdbcType=INTEGER}, - - - #{remains,jdbcType=INTEGER}, - - - #{forever,jdbcType=BIT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - #{createId,jdbcType=BIGINT}, - - - #{dsc,jdbcType=VARCHAR}, - - - - - - update rts_permission_distribute - - - id = #{record.id,jdbcType=BIGINT}, - - - permission_id = #{record.permissionId,jdbcType=BIGINT}, - - - source_subject_id = #{record.sourceSubjectId,jdbcType=BIGINT}, - - - amount = #{record.amount,jdbcType=INTEGER}, - - - remains = #{record.remains,jdbcType=INTEGER}, - - - forever = #{record.forever,jdbcType=BIT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - - - end_time = #{record.endTime,jdbcType=TIMESTAMP}, - - - create_id = #{record.createId,jdbcType=BIGINT}, - - - dsc = #{record.dsc,jdbcType=VARCHAR}, - - - - - - - - update rts_permission_distribute - set id = #{record.id,jdbcType=BIGINT}, - permission_id = #{record.permissionId,jdbcType=BIGINT}, - source_subject_id = #{record.sourceSubjectId,jdbcType=BIGINT}, - amount = #{record.amount,jdbcType=INTEGER}, - remains = #{record.remains,jdbcType=INTEGER}, - forever = #{record.forever,jdbcType=BIT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - end_time = #{record.endTime,jdbcType=TIMESTAMP}, - create_id = #{record.createId,jdbcType=BIGINT}, - dsc = #{record.dsc,jdbcType=VARCHAR} - - - - - - update rts_permission_distribute - - - permission_id = #{permissionId,jdbcType=BIGINT}, - - - source_subject_id = #{sourceSubjectId,jdbcType=BIGINT}, - - - amount = #{amount,jdbcType=INTEGER}, - - - remains = #{remains,jdbcType=INTEGER}, - - - forever = #{forever,jdbcType=BIT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - create_id = #{createId,jdbcType=BIGINT}, - - - dsc = #{dsc,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update rts_permission_distribute - set permission_id = #{permissionId,jdbcType=BIGINT}, - source_subject_id = #{sourceSubjectId,jdbcType=BIGINT}, - amount = #{amount,jdbcType=INTEGER}, - remains = #{remains,jdbcType=INTEGER}, - forever = #{forever,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP}, - create_id = #{createId,jdbcType=BIGINT}, - dsc = #{dsc,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - -