修改企业数据回收站bug

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Enterprise.java

@@ -2,6 +2,7 @@ package com.ruoyi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -79,7 +80,7 @@ public class Enterprise implements Serializable {
      * 注册资本
      */
     @TableField("registered_capital")
-    private BigDecimal registeredCapital;
+    private String registeredCapital;
     /**
      * 企业法人_id
      */
@@ -162,7 +163,8 @@ public class Enterprise implements Serializable {
     /**
      * 逻辑删除
      */
-    @TableField("hash")
+    @TableLogic
+    @TableField("show_delete")
     private String showDelete;
 
 

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/EnterpriseVo.java

@@ -60,7 +60,7 @@ public class EnterpriseVo {
     /**
      * 注册资本
      */
-    private BigDecimal registeredCapital;
+    private String registeredCapital;
     /**
      * 企业法人_id
      */

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandRecycleServiceImpl.java

@@ -30,7 +30,6 @@ public class BrandRecycleServiceImpl implements BrandRecycleService {
     @Override
     public void deleteBrand(String brandId) {
         int i = brandMapper.deleteById(brandId);
-        return;
     }
 
     @Override

ruoyi-demo/src/main/resources/mapper/demo/EnterpriseMapper.xml

@@ -7,18 +7,18 @@
         update ddt_enterprise set show_delete = 0 where enterprise_usci = #{enterpriseUsci}
     </update>
     <select id="list" parameterType="com.ruoyi.demo.entity.vo.EnterpriseVo" resultType="com.ruoyi.demo.entity.Enterprise">
-        select * from enterprise
+        select * from ddt_enterprise
         <where>
-            <if test="enterpriseUsci != null and enterpriseUsci != ''">
+            <if test="enterprise.enterpriseUsci != null and enterprise.enterpriseUsci != ''">
                 and enterprise_usci = #{enterprise.enterpriseUsci}
             </if>
-            <if test="addrCode != null and addrCode != ''">
+            <if test="enterprise.addrCode != null and enterprise.addrCode != ''">
                 and addr_code = #{enterprise.addrCode}
             </if>
-            <if test="showDelete != null">
+            <if test="enterprise.showDelete != null">
                 and show_delete = #{enterprise.showDelete}
             </if>
-            <if test="enterpriseName != null and enterpriseName != ''">
+            <if test="enterprise.enterpriseName != null and enterprise.enterpriseName != ''">
                 and enterprise_name like concat('%',#{enterprise.enterpriseName},'%')
             </if>
         </where>