'提交修改'

hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java

@@ -144,6 +144,7 @@ public class HighMerchantStoreController {
                 Map<String, Object> map = new HashMap<>();
                 map.put("companyId", bsCompany.getId());
                 map.put("status", 1);
+                map.put("ext1", true);
                 return ResponseMsgUtil.success(highMerchantService.getMerchantList(map));
             }
             return ResponseMsgUtil.success(new ArrayList<>());

hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java

@@ -124,6 +124,11 @@ public class HighMerchantServiceImpl implements HighMerchantService {
             criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
         }
 
+        // todo
+        if (MapUtils.getBoolean(map, "ext1") == true) {
+            criteria.andExt1IsNull();
+        }
+
         example.setOrderByClause("create_time desc");
         return highMerchantMapper.selectByExample(example);
     }

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -14,6 +14,8 @@ import com.hai.model.HighOrderData;
 import com.hai.model.HighOrderModel;
 import com.hai.service.*;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -327,7 +329,7 @@ public class HighOrderServiceImpl implements HighOrderService {
             criteria.andMemIdEqualTo(MapUtils.getLong(map, "memId"));
         }
 
-        if (MapUtils.getString(map, "status") != null) {
+        if (StringUtils.isNotBlank(MapUtils.getString(map, "status"))) {
             String[] statuses = MapUtils.getString(map, "status").split(",");
             List<Integer> list = new ArrayList<>();
             for (String status : statuses) {