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

src/main/java/com/xjrsoft/module/textbook/dto/DistributePageDto.java

@@ -21,7 +21,7 @@ public class DistributePageDto extends PageInput {
     @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
     private String claimType;
 
-    @ApiModelProperty("是否有过发放（1：未发放，2：部分发放，3：全部发放）")
+    @ApiModelProperty("是否有过发放（1：未发放，2：部分发放，3：全部发放，4：有发放）")
     private Integer distributeStatus;
 
     @ApiModelProperty("姓名")

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -102,7 +102,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 .eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
                 .eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
                 .eq(ObjectUtils.isNotEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, dto.getDistributeStatus())
-                .ne(ObjectUtils.isEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, 1)
+                .ne(ObjectUtils.isNotEmpty(dto.getDistributeStatus()) && dto.getDistributeStatus() == 4, WfTextbookClaim::getStatus, 1)
                 .and(StringUtils.isNotEmpty(dto.getName()),
                         wrapper -> wrapper
                                 .like(XjrUser::getName, dto.getName())