Commit dd71840fc9e31dfbe7d4721aa80e722c3ba7572e
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
2 changed files
with
6 additions
and
4 deletions
| @@ -174,7 +174,9 @@ public class ContractDistributorStandardController extends DefaultBaseController | @@ -174,7 +174,9 @@ public class ContractDistributorStandardController extends DefaultBaseController | ||
| 174 | } | 174 | } |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | - vo.setCreateById(SecurityUtil.getCurrentUser().getId()); | 177 | + if (!"DELETED".equals(vo.getStatus())) { |
| 178 | + vo.setCreateById(SecurityUtil.getCurrentUser().getId()); | ||
| 179 | + } | ||
| 178 | 180 | ||
| 179 | PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo); | 181 | PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo); |
| 180 | 182 |
| @@ -172,9 +172,9 @@ | @@ -172,9 +172,9 @@ | ||
| 172 | </if> | 172 | </if> |
| 173 | <if test="vo.status != null"> | 173 | <if test="vo.status != null"> |
| 174 | AND tb.status LIKE CONCAT(#{vo.status}, '%') | 174 | AND tb.status LIKE CONCAT(#{vo.status}, '%') |
| 175 | - <if test="vo.status == 'DRAFT' and vo.createById != null"> | ||
| 176 | - AND tb.create_by_id = #{vo.createById} | ||
| 177 | - </if> | 175 | + </if> |
| 176 | + <if test="vo.createById != null and vo.createById != ''"> | ||
| 177 | + AND tb.create_by_id = #{vo.createById} | ||
| 178 | </if> | 178 | </if> |
| 179 | <if test="vo.type != null"> | 179 | <if test="vo.type != null"> |
| 180 | AND tb.type = #{vo.type} | 180 | AND tb.type = #{vo.type} |