Commit 649d094a authored by liuxun's avatar liuxun

merge

parent a750a29f
package com.hungraim.ltc.service.impl; package com.hungraim.ltc.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.api.AttachFeignService; import com.hungraim.ltc.api.AttachFeignService;
import com.hungraim.ltc.dao.*; import com.hungraim.ltc.dao.*;
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<if test="code != null and code != ''"> <if test="code != null and code != ''">
and organ.UNIFIED_SOCIAL_CREDIT_CODE = #{code} and organ.UNIFIED_SOCIAL_CREDIT_CODE = #{code}
</if> </if>
order by organ.APR_ORGAN_ID
</select> </select>
<!--评定人员信息列表--> <!--评定人员信息列表-->
...@@ -112,7 +113,7 @@ ...@@ -112,7 +113,7 @@
and organ.ORGAN_NAME LIKE CONCAT('%',CONCAT( #{organName} ,'%')) and organ.ORGAN_NAME LIKE CONCAT('%',CONCAT( #{organName} ,'%'))
</if> </if>
<if test="realName != null and realName != ''"> <if test="realName != null and realName != ''">
and emp.real_name = LIKE CONCAT('%',CONCAT( #{realName} ,'%')) and emp.real_name LIKE CONCAT('%',CONCAT( #{realName} ,'%'))
</if> </if>
<if test="tel != null and tel != ''"> <if test="tel != null and tel != ''">
and emp.tel = #{tel} and emp.tel = #{tel}
......
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