Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Renpc-kilig 2021-05-12 10:46:51 +08:00
commit d050f7b602
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java
View File

@ -62,7 +62,6 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
public SuccessResultList<List<ApplyDTO>> listPageMyApply(String token,ListPage page){
if (StringUtils.isBlank(token)) {
page.getParams().put("creator",securityComponent.getCurrentUser().getUserId());
@ -88,11 +87,6 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
public void audit(String token,ApplyAuditVO applyAuditVO){
ApplyDTO applyDTO = this.get(applyAuditVO.getApplyId());
if(applyDTO == null){

2
src/main/resources/mybatis/mapper/apply/apply-mapper.xml
View File

@ -444,6 +444,8 @@
t1.apply_class_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.apply_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.apply_card_number LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">