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

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

 zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java

@@ -111,6 +111,10 @@
    @RequestMapping(value = "/modifyDataDictionary")
    public @ResponseBody
    AjaxResult modifyDataDictionary(CustomerDataDictionary newDataDictionary) {
        // 自己不能是自己的父节点
        if (newDataDictionary.getParentId() != null && newDataDictionary.getParentId().equals(newDataDictionary.getId())) {
            throw new GlobleException("父级不能是自己");
        }
        dataDictionaryDao.updateByModel(newDataDictionary);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.UPDATE_SUCCES, "数据字典");