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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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

@@ -63,8 +63,6 @@
    ManageMenuService manageMenuService;
    @Autowired
    ManageAccountRoleMapper manageAccountRoleMapper;
    @Autowired
    LogUtils logUtils;

    /**
     * @Description: 登陆接口
@@ -124,7 +122,7 @@
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        StringBuilder content = new StringBuilder();
        content.append(manageAccount.getUserName()).append("登陆了后台系统;");
        logUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
        LogUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());

        return loginDTO;
    }
@@ -311,6 +309,13 @@
            accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
            return accountDTO;
        }
        //禁止删除自己的账号
        AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
        if(accountInfo.getAccount().getId().equals(accountId)){
            accountDTO.setCode(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getCode());
            accountDTO.setMsg(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getMsg());
            return accountDTO;
        }
        //逻辑删除账号
        UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
        deleteAccountWrapper.eq("id", accountId);
@@ -384,7 +389,7 @@
        if(!ObjectUtils.isEmpty(newAccount.getPassword()))
            content.append("修改了密码");
        String resultContent = CompareFieldUtils.resultsConvertContent(results,content.toString());
        logUtils.saveOperationForManage(resultContent, Constants.UPDATE_OPERATE_TYPE);
        LogUtils.saveOperationForManage(resultContent, Constants.UPDATE_OPERATE_TYPE);
    }

    /**
@@ -398,7 +403,7 @@
        StringBuilder content = new StringBuilder();
        content.append("添加了后台用户：").append(manageAccount.getUserName() + ";")
                .append("account：" + manageAccount.getAccount() + ";");
        logUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
        LogUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
    }


@@ -413,7 +418,7 @@
        StringBuilder content = new StringBuilder();
        content.append("删除了用户：").append(manageAccount.getUserName() + ";")
                .append("账号:" + manageAccount.getAccount() + ";");
        logUtils.saveOperationForManage( content.toString(), Constants.DELETE_OPERATE_TYPE);
        LogUtils.saveOperationForManage( content.toString(), Constants.DELETE_OPERATE_TYPE);
    }
}