Ver código fonte

公司邮箱配置代码自测调整

chenjianhua 7 meses atrás
pai
commit
4a024241c6

+ 5 - 3
service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -11,10 +11,10 @@
         <result column="send_remark" property="sendRemark"/>
     </resultMap>
     <update id="deleteEmailHistory">
-        update company_email_send_history set isvalid =0,updatetime=sysdate() where email=#{email}
+        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate() where email=#{email}
     </update>
     <update id="deleteEmailHistoryByIds">
-        update company_email_send_history set isvalid =0,updatetime=sysdate() where id in
+        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate() where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -58,9 +58,11 @@
         FROM
             PPW_EMAIL.company_email_send_history cesh
             JOIN PPW_EMAIL.company_email_config cec
+            JOIN PPW_EMAIL.company_information c
+            ON cec.company_id = c.company_id
             ON cec.email = cesh.email
         WHERE cec.isvalid = 1
-        AND cesh.isvalid = 1
+        AND cesh.isvalid = 1 and c.isvalid =1
         <if test="email != null and email !=''">
             and cec.email=#{email}
         </if>