feat: 代码合并，解决冲突

service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -41,9 +41,40 @@
           and source_register_number = #{registerNumber}
     </select>
 
+    <select id="searchFundAlias" resultMap="BaseResultMap"
+            parameterType="com.simuwang.base.pojo.dto.query.FundAliasPageQuery">
+        select id,source_fund_name,source_register_number,target_fund_id,target_fund_name,target_register_number,isvalid,
+        creatorid,createtime,updatetime,updaterid
+        from PPW_EMAIL.fund_alias where isvalid=1
+        <if test="fundName != null and fundName !=''">
+            and (source_fund_name like concat('%',#{fundName},'%') or source_register_number like concat('%',#{fundName},'%') )
+        </if>
+        <if test="fundAliasName != null and fundAliasName !=''">
+            and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
+        </if>
+        limit #{offset},#{pageSize}
+    </select>
+    <select id="countFundAlias" resultType="java.lang.Long"
+            parameterType="com.simuwang.base.pojo.dto.query.FundAliasPageQuery">
+        select count(1) from PPW_EMAIL.fund_alias where isvalid=1
+        <if test="fundName != null and fundName !=''">
+            and (source_fund_name like concat('%',#{fundName},'%') or source_register_number like concat('%',#{fundName},'%') )
+        </if>
+        <if test="fundAliasName != null and fundAliasName !=''">
+            and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
+        </if>
+    </select>
+    <select id="searchFundAliasById" resultType="com.simuwang.base.pojo.dos.FundAliasDO"
+            parameterType="java.lang.Integer">
+        select id,source_fund_name,source_register_number,target_fund_id,target_fund_name,target_register_number,isvalid,
+               creatorid,createtime,updatetime,updaterid
+        from PPW_EMAIL.fund_alias where isvalid=1 and id=#{id}
+    </select>
+
     <insert id="insert">
         insert into PPW_EMAIL.fund_alias(source_fund_name, source_register_number)
         values (#{fundName}, #{registerNumber})
     </insert>
 
+
 </mapper>