Commit eb96c2cde02e65118af7fc401b57c969d211cf30

Authored by 杨鸣坤
1 parent f3949b62

楚江ERP:合同展示逻辑调整,删除的合同才能看到全部

... ... @@ -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 181 PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo);
180 182
... ...
... ... @@ -172,9 +172,9 @@
172 172 </if>
173 173 <if test="vo.status != null">
174 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 178 </if>
179 179 <if test="vo.type != null">
180 180 AND tb.type = #{vo.type}
... ...