合并本地分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -418,6 +418,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
         if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
+            tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");
         }else {

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -236,6 +236,6 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and status = 1
   </select>
 </mapper>