Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java

@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -72,13 +73,18 @@

    @Override
    public void deleteById(String id) {
        baseParamMapper.deleteById(id);
        BaseParam baseParam = new BaseParam();
        baseParam.setId(id);
        baseParam.setEditDate(new Date());
        baseParam.setIsdeleted(Constants.ONE);
        baseParamMapper.updateById(baseParam);
    }

    @Override
    public void delete(BaseParam baseParam) {
        UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
        baseParamMapper.delete(deleteWrapper);
//      UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ONE);
        baseParamMapper.updateById(baseParam);
    }

    @Override
@@ -87,7 +93,9 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        baseParamMapper.deleteBatchIds(ids);
       for(String id :ids){
           deleteById(id);
       }
    }

    @Override
@@ -97,7 +105,7 @@
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,baseParam.getName());
                .eq(BaseParam::getName,baseParam.getName());

        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
        if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
@@ -107,6 +115,7 @@
        updateWrapper
                .lambda()
                .eq(BaseParam::getId,baseParam.getId())
                .set(BaseParam::getRequired,baseParam.getRequired())
                .set(BaseParam::getName,baseParam.getName())
                .set(BaseParam::getSortnum,baseParam.getSortnum())
                .set(BaseParam::getEditDate,new Date())
@@ -138,6 +147,7 @@
    @Override
    public List<BaseParam> findList(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ZERO);
        wrapper.orderByAsc("sortnum");
        return baseParamMapper.selectList(wrapper);
    }
@@ -193,6 +203,7 @@
    @Override
    public long count(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ZERO);
        return baseParamMapper.selectCount(wrapper);
    }
}