src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
@@ -16,10 +16,7 @@ */ package org.springblade.modules.task.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; @@ -78,13 +75,13 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("create_time") @TableField(value = "create_time",fill = FieldFill.INSERT) private Date createTime; /** 更新时间 */ @ApiModelProperty(value = "更新时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("update_time") @TableField(value = "update_time",fill = FieldFill.UPDATE) private Date updateTime; /** 创建人 */ src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -49,7 +49,7 @@ <if test="isAdministrator==2"> <!-- 网格员及其他 --> <if test="residen.roleType ==null"> <if test="residen.roleType ==null and residen.roleName !='inhabitant'"> <choose> <when test="regionChildCodesList !=null and regionChildCodesList.size()>0"> and ( src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java
@@ -67,7 +67,9 @@ @Override public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) { CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply); if(taskResidencePermitApply.getRoleName().equals("inhabitant")){ taskResidencePermitApply.setCreateUser(AuthUtil.getUserId()); } return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, taskResidencePermitApply, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList())); }