|
|
@ -174,6 +174,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
qw.eq("pushMessgae", 0); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateBySid())) { |
|
|
|
qw.eq("createBySid", query.getCreateBySid()); |
|
|
|
qw.eq("staffUserSid",query.getCreateBySid()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
qw.ne("auditState", 0); |
|
|
@ -206,9 +207,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
if ("0".equals(query.getState())) { |
|
|
|
qw.eq("pushMessgae", 0); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateBySid())) { |
|
|
|
/* if (StringUtils.isNotBlank(query.getCreateBySid())) { |
|
|
|
qw.eq("createBySid", query.getCreateBySid()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
} |
|
|
|
return qw; |
|
|
@ -786,6 +787,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(pagerQuery.getUserSid())){ |
|
|
|
qw.eq("createBySid",pagerQuery.getUserSid()); |
|
|
|
qw.eq("staffUserSid",pagerQuery.getUserSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
qw.eq("pushMessgae", 0); |
|
|
|