Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java

@@ -236,12 +236,14 @@
//            .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
        if(detail == null){//不是最新的不让改
            throw new ServiceException("当前数据不是最新，请刷新后再修改！");
//            return R.fail("当前数据不是最新，请刷新后再修改！");
        }
        //校验下级是否有引用
        if(checkChildIsLinked(detail.getOid())){
            return R.fail("dataCascadeLinkedNotDelete");
        }
        if(checkHasChild(detail.getOid())){
            return R.fail("此数据有下级，无法进行删除！");
        }
        return R.status(!checkHasChild(detail.getOid()));
    }


 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java

@@ -308,7 +308,7 @@
            query.setCurrent(pageHelper.getPage());
        }
        IPage<CodeClassifyTemplateAttr> doList = baseMapper.
            selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class));
            selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class).orderByAsc("ordernum"));
        if (!CollectionUtils.isEmpty(doList.getRecords())) {
            dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
            dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class)))));