保养工单 我的相关接口更新 暂不用

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -34,11 +34,10 @@
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion, p.equipmentid
         from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
         <where>
-            <if test="cmmsUpkeepDto.createBy != null and cmmsUpkeepDto.createBy != ''"> and c.create_by = #{cmmsUpkeepDto.createBy}</if>
+            <if test="cmmsUpkeepDto.createBy != null and cmmsUpkeepDto.createBy != ''"> (c.create_by = #{cmmsUpkeepDto.createBy} or c.chargeruser = #{cmmsUpkeepDto.chargeruser})</if>
             <if test="cmmsUpkeepDto.upkeepcode != null and cmmsUpkeepDto.upkeepcode != ''"> and c.upkeepcode like concat('%', #{cmmsUpkeepDto.upkeepcode}, '%')</if>
             <if test="cmmsUpkeepDto.planname != null and cmmsUpkeepDto.planname != ''"> and c.planname like concat('%', #{cmmsUpkeepDto.planname}, '%')</if>
             <if test="cmmsUpkeepDto.address != null and cmmsUpkeepDto.address != ''"> and c.address = #{cmmsUpkeepDto.address}</if>
-            <if test="cmmsUpkeepDto.chargeruser != null and cmmsUpkeepDto.chargeruser != ''"> and c.chargeruser = #{cmmsUpkeepDto.chargeruser}</if>
             <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and p.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
             <if test="cmmsUpkeepDto.status != null and cmmsUpkeepDto.status != ''"> and c.status = #{cmmsUpkeepDto.status}</if>
         </where>