zhanghua
2022-10-09 5df2a2026692a36f564166b2a830de526381c128
bug修改
6个文件已修改
23 ■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
@@ -38,13 +38,13 @@
    private String departDes;
    @ApiModelProperty("部门类型")
    private byte departType;
    private Long departType;
    @ApiModelProperty("父级id,默认0")
    private Long parentId;
    @ApiModelProperty("停用状态,0->false,1->true,默认停用")
    private byte status;
    private Short status;
    /**
     * 逻辑删除 0:false 1:true 默认0
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -51,6 +51,7 @@
        }
        UmsDepart depart = new UmsDepart();
        BeanUtils.copyProperties(addDepartVO, depart);
        depart.setStatus(Short.valueOf("1"));
        if (sccgDepartMapper.insert(depart) != 1) {
            throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
        }
ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
@@ -100,7 +100,7 @@
        private String departDes;
        @ApiModelProperty("部门类型")
        private byte departType;
        private Long departType;
        @ApiModelProperty("用户Id")
        private Long userId;
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -37,9 +37,9 @@
    }
    @GetMapping("/queryByCode")
    @ApiOperation(("/根据code获取字段信息"))
    private CommonResult<DataDictionary> queryByCode(@RequestParam(value = "code") String code){
        DataDictionary dataDictionary = iDatabaseDictionaryService.queryByCode(code);
    @ApiOperation(("根据code获取字段信息"))
    private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code){
        List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
        return CommonResult.success(dataDictionary);
    }
}
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
@@ -27,7 +27,7 @@
     * @param code
     * @return
     */
    DataDictionary queryByCode(String code);
    List<DataDictionary> queryByCode(String code);
    Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -49,22 +49,22 @@
    }
    @Override
    public DataDictionary queryByCode(String code) {
    public List<DataDictionary> queryByCode(String code) {
        LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getTypeCode, code);
        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
        List<DataDictionary> dataDictionary = dataDictionaryMapper.selectList(queryWrapper);
        return dataDictionary;
    }
    @Override
    public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage,keyWord);
        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
        return dataDictionaryPageList;
    }
    @Override
    public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
        dataDictionaryPage.setOptimizeCountSql(false);
        Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
        Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
        return dataDictionaryPageList;
    }
}