修改企业回收站数据校验

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

@@ -81,7 +81,6 @@ public class EnterpriseVo {
     /**
      * 经营状态：存续、在业、吊销、注销、迁入、迁出、停业、清算
      */
-    @NotBlank(message = "经营状态不能为空",groups = {AddGroup.class, EditGroup.class})
     private String businessStatus;
     /**
      * 行业分类（关联行业分类表）
@@ -90,7 +89,6 @@ public class EnterpriseVo {
     /**
      * 企业类型：有限责任公司; 股份公司；股份有限公司
      */
-    @NotBlank(message = "企业类型不能为空",groups = {AddGroup.class, EditGroup.class})
     private String enterpriseType;
     /**
      * 信用评分

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

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