Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java

@@ -45,8 +45,6 @@
    @Autowired(required = false)
    private ManageRoleMenuMapper manageRoleMenuMapper;

    @Autowired
    LogUtils logUtils;

    @Override
    @Transactional
@@ -74,7 +72,7 @@
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "添加菜单:"+manageMenu.getName()+";";
        logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
@@ -139,7 +137,7 @@
                content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
            }
        }
        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
        LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
@@ -171,7 +169,7 @@
            //操作插入日志
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "删除菜单:"+manageMenuDelete.getName()+";";
            logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
            LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
            resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        }