大屏功能代码提交

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/merchantCompany/service/MerchantCompanyService.java

@@ -99,6 +99,9 @@ public class MerchantCompanyService extends ServiceImpl<MerchantCompanyMapper, M
         if(StringUtils.isNotBlank(merchantCompanyDTO.getLinkmanPhone())){
             queryWrapper.like("a.linkman_phone",merchantCompanyDTO.getLinkmanPhone());
         }
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getCompanyType())){
+            queryWrapper.like("a.company_type",merchantCompanyDTO.getCompanyType());
+        }
         if (merchantCompanyDTO.getAnnualSalesList() != null && merchantCompanyDTO.getAnnualSalesList().length > 0) {
             if(merchantCompanyDTO.getAnnualSalesList().length == 1){
                 queryWrapper.ge("a.annual_sales",merchantCompanyDTO.getAnnualSalesList()[0]);
@@ -166,7 +169,7 @@ public class MerchantCompanyService extends ServiceImpl<MerchantCompanyMapper, M
      */
     public void saveOrUpdate(MerchantCompanyDTO merchantCompanyDTO) {
         //处理是否为电商小铺
-        if(StringUtils.isNotBlank(merchantCompanyDTO.getCommerceShop())){
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getCommerceShop()) && !"1".equals(merchantCompanyDTO.getCommerceShop()) && !"0".equals(merchantCompanyDTO.getCommerceShop())){
             switch (merchantCompanyDTO.getCommerceShop()){
                 case "是":
                     merchantCompanyDTO.setCommerceShop("1");
@@ -180,7 +183,7 @@ public class MerchantCompanyService extends ServiceImpl<MerchantCompanyMapper, M
             }
         }
         //处理公司类型
-        if(StringUtils.isNotBlank(merchantCompanyDTO.getCompanyType())){
+        if(StringUtils.isNotBlank(merchantCompanyDTO.getCompanyType()) && !"1".equals(merchantCompanyDTO.getCompanyType()) && !"2".equals(merchantCompanyDTO.getCompanyType())){
             switch (merchantCompanyDTO.getCompanyType()){
                 case "产品加工企业":
                     merchantCompanyDTO.setCompanyType("1");