Merge #97 into master from cc_20260414_store

feat:bug处理

* cc_20260414_store: (6 commits squashed)

  - feat:省市区

  - feat:设备接口

  - feat:设备接口

  - feat:获取门店设备列表 get->post

  - feat:异常处理

  - feat:bug处理

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/97
This commit is contained in:
正新
2026-04-14 09:53:00 +00:00
parent 11ce6dc306
commit 9ad7fa0f5a
8 changed files with 267 additions and 3 deletions

View File

@@ -12,6 +12,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -44,6 +45,9 @@ public class StoreTypeOptionDAO {
}
public List<StoreTypeOptionDO> selectByIds(List<Long> optionIds,Long storeTypeId){
if (storeTypeId==null||CollectionUtils.isEmpty(optionIds)){
return new ArrayList<>();
}
Example example = new Example(StoreTypeOptionDO.class);
example.createCriteria().andIn("optionId", optionIds).andEqualTo("storeTypeId",storeTypeId);
return mapper.selectByExample(example);