20220606

xiaoyong931011

2022-06-07 33cd99e2509c88ce838ec2c68f2d36de80e27a6c

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

@@ -50,7 +50,7 @@
                        child.setId(columnEntityChild.getId());
                        child.setColumnName(columnEntityChild.getColumnName());
                        child.setColumnCode(columnEntityChild.getColumnCode());
                        child.setDescribe(columnEntityChild.getDescribe());
                        child.setRemark(columnEntityChild.getRemark());
                        child.setPic(columnEntityChild.getPic());
                        child.setOrderNum(columnEntityChild.getOrderNum());
                        adminColumnVoChilds.add(child);
@@ -82,9 +82,9 @@
            return Result.fail("栏目编码不能重复");
        }
        columnEntity.setColumnCode(columnCode);
        String describe = adminAddColumnDto.getDescribe();
        if(StrUtil.isNotEmpty(describe)){
            columnEntity.setDescribe(describe);
        String remark = adminAddColumnDto.getRemark();
        if(StrUtil.isNotEmpty(remark)){
            columnEntity.setRemark(remark);
        }
        String pic = adminAddColumnDto.getPic();
        if(StrUtil.isNotEmpty(pic)){
@@ -131,7 +131,7 @@
        adminSeeColumnInfoVo.setId(columnEntity.getId());
        adminSeeColumnInfoVo.setColumnName(columnEntity.getColumnName());
        adminSeeColumnInfoVo.setColumnCode(columnEntity.getColumnCode());
        adminSeeColumnInfoVo.setDescribe(columnEntity.getDescribe());
        adminSeeColumnInfoVo.setRemark(columnEntity.getRemark());
        adminSeeColumnInfoVo.setParentId(columnEntity.getParentId());
        adminSeeColumnInfoVo.setOrderNum(columnEntity.getOrderNum());
        adminSeeColumnInfoVo.setPic(columnEntity.getPic());
@@ -161,13 +161,13 @@
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities)){
        if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
            return Result.fail("栏目编码不能重复");
        }
        columnEntity.setColumnCode(columnCode);
        String describe = adminUpdateColumnDto.getDescribe();
        if(StrUtil.isNotEmpty(describe)){
            columnEntity.setDescribe(describe);
        String remark = adminUpdateColumnDto.getRemark();
        if(StrUtil.isNotEmpty(remark)){
            columnEntity.setRemark(remark);
        }
        String pic = adminUpdateColumnDto.getPic();
        if(StrUtil.isNotEmpty(pic)){
@@ -203,7 +203,7 @@
                        child.setId(columnEntityChild.getId());
                        child.setColumnName(columnEntityChild.getColumnName());
                        child.setColumnCode(columnEntityChild.getColumnCode());
                        child.setDescribe(columnEntityChild.getDescribe());
                        child.setRemark(columnEntityChild.getRemark());
                        child.setPic(columnEntityChild.getPic());
                        child.setOrderNum(columnEntityChild.getOrderNum());
                        adminColumnVoChilds.add(child);