Commit 32e4a060 authored by chenzhao's avatar chenzhao

修改bug

parent f3aaa468
...@@ -60,13 +60,13 @@ ...@@ -60,13 +60,13 @@
and submission_time between #{startTime} and #{endTime} and submission_time between #{startTime} and #{endTime}
</if> </if>
<if test="submissionName != null "> <if test="submissionName != null ">
and submission_name = #{submissionName} and submission_name = like concat (%, #{submissionName},%)
</if> </if>
<if test="submissionBranchId!= null "> <if test="submissionBranchId!= null ">
and submission_branch_id = #{submissionBranchId} and submission_branch_id= #{submissionBranchId}
</if> </if>
<if test="sequenceNbr!= null "> <if test="sequenceNbr!= null ">
and sequence_nbr = #{ sequenceNbr} and sequence_nbr = like concat (%,#{ sequenceNbr},%)
</if> </if>
</where> </where>
order by submission_time DESC limit #{current},#{size} order by submission_time DESC limit #{current},#{size}
......
...@@ -282,9 +282,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -282,9 +282,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
failureDetailsDto.setFailureCode(buildOrderNo()); failureDetailsDto.setFailureCode(buildOrderNo());
String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()); String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
if (parentId != null){
failureDetailsDto.setBizCode(Long.valueOf(parentId));
}
OrgUsr orgUsr = iOrgUsrService.getById(parentId); OrgUsr orgUsr = iOrgUsrService.getById(parentId);
failureDetailsDto.setBizCode(Long.valueOf(parentId));
model = this.createWithModel(failureDetailsDto); model = this.createWithModel(failureDetailsDto);
if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) { if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment