Merge remote-tracking branch 'origin/master'

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java

@@ -54,52 +54,38 @@ import java.util.List;
 @Service
 public class BaseSupplierBankService extends MybatisBaseService<BaseSupplierBankMapper, BaseSupplierBank> {
 
-	public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
-		BaseSupplierBankQuery query = pq.getParams();
-		QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
-		IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
-		IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(BaseSupplierBankDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(BaseSupplierBankDto dto){
-		BaseSupplierBank entity = new BaseSupplierBank();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(BaseSupplierBankDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		BaseSupplierBank entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){
-		BaseSupplierBank entity = fetchBySid(sid);
-		BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+    public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
+        BaseSupplierBankQuery query = pq.getParams();
+        QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
+        IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
+        IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 
-	public int deleteBySupplierSid(String supplierSid) {
-		return baseMapper.deleteBySupplierSid(supplierSid);
-	}
+    public void saveOrUpdateDto(BaseSupplierBankDto dto) {
+        this.insertByDto(dto);
+        return;
+    }
 
-	public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
-		return baseMapper.selectBySupplierSid(supplierSid);
-	}
+    public void insertByDto(BaseSupplierBankDto dto) {
+        BaseSupplierBank entity = new BaseSupplierBank();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseSupplierBank entity = fetchBySid(sid);
+        BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public int deleteBySupplierSid(String supplierSid) {
+        return baseMapper.deleteBySupplierSid(supplierSid);
+    }
+
+    public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
+        return baseMapper.selectBySupplierSid(supplierSid);
+    }
 }