20220606

xiaoyong931011

2022-06-27 a1a8c47ed291ad43fb4b02a6a675c3b8e8841f36

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java

@@ -80,6 +80,9 @@
        String columnCode = adminAddColumnDto.getColumnCode();
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        if(UserEntity.USER_BELONG_TOP != companyId){
            objectQueryWrapper.eq("company_id",companyId);
        }
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities)){
            return Result.fail("栏目编码不能重复");
@@ -140,6 +143,8 @@
    @Override
    @Transactional
    public Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto) {
        UserEntity userlogin = LoginUserUtil.getLoginUser();
        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
        Long id = adminUpdateColumnDto.getId();
        if(ObjectUtil.isEmpty(id)){
            return Result.fail("栏目不存在");
@@ -153,6 +158,9 @@
        String columnCode = adminUpdateColumnDto.getColumnCode();
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        if(UserEntity.USER_BELONG_TOP != companyId){
            objectQueryWrapper.eq("company_id",companyId);
        }
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
            return Result.fail("栏目编码不能重复");