From 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 27 六月 2023 11:00:01 +0800
Subject: [PATCH] 日志管理
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 15 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java | 12 ++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 8 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 6 ++
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java | 31 +++++----
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 3 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java | 6 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 3 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 4 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtBirthdayController.java | 3 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 28 ++++++++
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java | 9 +-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java | 6 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java | 6 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java | 5 +
19 files changed, 117 insertions(+), 35 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
index 461600f..6c75879 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
@@ -63,4 +63,6 @@
String COUPON_USED = "优惠券已被核销";
String COUPON_TYPE_ERROR = "只能核销商品优惠券";
+
+ String STAFF_MOBILE_DOUBLE = "手机号码已被注册";
}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
index 6152ee1..a1aaf9b 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
@@ -1,12 +1,9 @@
package com.ruoyi.common.log.annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+
+import java.lang.annotation.*;
/**
* 自定义操作日志记录注解
@@ -24,6 +21,8 @@
*/
public String title() default "";
+ public String operContent() default "";
+
/**
* 功能
*/
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
index f0fcdbe..5220e2a 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -1,9 +1,15 @@
package com.ruoyi.common.log.aspect;
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessStatus;
+import com.ruoyi.common.log.filter.PropertyPreExcludeFilter;
+import com.ruoyi.common.log.service.AsyncLogService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.poji.sys.SysOperLog;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
@@ -18,16 +24,11 @@
import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile;
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessStatus;
-import com.ruoyi.common.log.filter.PropertyPreExcludeFilter;
-import com.ruoyi.common.log.service.AsyncLogService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.poji.sys.SysOperLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.Map;
/**
* 操作日志记录处理
@@ -141,6 +142,8 @@
operLog.setBusinessType(log.businessType().ordinal());
// 设置标题
operLog.setTitle(log.title());
+ //设置操作内容
+ operLog.setOperContent(log.operContent());
// 设置操作人类别
operLog.setOperatorType(log.operatorType().ordinal());
// 是否需要保存request，参数和值
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
index 766a27d..45b2518 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
@@ -39,6 +41,7 @@
private ActivityService activityService;
@RequestMapping(value = "/editMgtActivity", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.UPDATE,operContent = "编辑活动")
@ApiOperation(value = "平台编辑活动")
public R editMgtActivity(@RequestBody MgtActivityEditDto mgtActivityEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -67,6 +70,7 @@
}
@RequestMapping(value = "/deleteMgtActivity", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.DELETE,operContent = "删除活动")
@ApiOperation(value = "平台删除活动")
public R deleteMgtActivity(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
index ee21925..7948f93 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.goods.domain.vo.MgtGoodsPageVo;
@@ -69,6 +71,7 @@
}
@RequestMapping(value = "/editMgtGoods", method = RequestMethod.POST)
+ @Log(title = "商品管理", businessType = BusinessType.UPDATE,operContent = "编辑商品")
@ApiOperation(value = "平台编辑商品")
public R editMgtGoods(@RequestBody MgtGoodsEditDto mgtGoodsEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -78,6 +81,7 @@
}
@RequestMapping(value = "/upDownMgtGoods", method = RequestMethod.POST)
+ @Log(title = "商品管理", businessType = BusinessType.UPDATE,operContent = "上下架商品")
@ApiOperation(value = "平台上下架商品")
public R upDownMgtGoods(@RequestBody MgtGoodsUpDownDto mgtGoodsUpDownDto) {
Long userId = SecurityUtils.getUserId();
@@ -87,6 +91,7 @@
}
@RequestMapping(value = "/recommendMgtGoods", method = RequestMethod.POST)
+ @Log(title = "商品管理", businessType = BusinessType.UPDATE,operContent = "推荐商品")
@ApiOperation(value = "平台推荐商品")
public R recommendMgtGoods(@RequestBody MgtGoodsRecommendDto mgtGoodsRecommendDto) {
Long userId = SecurityUtils.getUserId();
@@ -96,6 +101,7 @@
}
@RequestMapping(value = "/deleteMgtGoods", method = RequestMethod.POST)
+ @Log(title = "商品管理", businessType = BusinessType.DELETE,operContent = "删除商品")
@ApiOperation(value = "删除商品")
public R deleteMgtGoods(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtBirthdayController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtBirthdayController.java
index 1b42d9a..4a9d73a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtBirthdayController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtBirthdayController.java
@@ -1,6 +1,8 @@
package com.ruoyi.member.controller.management;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
@@ -31,6 +33,7 @@
private BirthdayCardService birthdayCardService;
@RequestMapping(value = "/editMgtBirthdayCard", method = RequestMethod.POST)
+ @Log(title = "生日卡管理", businessType = BusinessType.UPDATE,operContent = "编辑生日卡")
@ApiOperation(value = "平台编辑生日卡")
public R editMgtBirthdayCard(@RequestBody MgtBirthdayEditDto mgtBirthdayEditDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
index e2b6a66..bef8300 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
@@ -55,6 +57,7 @@
}
@RequestMapping(value = "/editMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "编辑优惠券")
@ApiOperation(value = "平台编辑优惠券")
public R editMgtCoupon(@RequestBody MgtCouponEditDto mgtCouponEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -64,6 +67,7 @@
}
@RequestMapping(value = "/deleteMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.DELETE,operContent = "删除优惠券")
@ApiOperation(value = "平台删除优惠券")
public R deleteMgtCoupon(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -101,6 +105,7 @@
}
@RequestMapping(value = "/auditMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "审核优惠券")
@ApiOperation(value = "平台审核优惠券")
public R auditMgtCoupon(@RequestBody MgtCouponAuditDto mgtCouponAuditDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
index 45f7f60..e10259b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
@@ -70,6 +72,7 @@
}
@RequestMapping(value = "/editMemberRelationShop", method = RequestMethod.POST)
+ @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员关联商户")
@ApiOperation(value = "修改会员关联商户")
public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MgtMemberRelEditDto mgtMemberRelEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -79,6 +82,7 @@
}
@RequestMapping(value = "/deleteMemberRelationShop", method = RequestMethod.POST)
+ @Log(title = "会员管理", businessType = BusinessType.DELETE,operContent = "删除会员关联商户")
@ApiOperation(value = "删除会员关联商户")
public R<MerMemberInfoVo> deleteMemberRelationShop(@RequestBody MgtMemberRelDelDto mgtMemberRelDelDto) {
Long userId = SecurityUtils.getUserId();
@@ -88,6 +92,7 @@
}
@RequestMapping(value = "/editMemberIntegral", method = RequestMethod.POST)
+ @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员积分")
@ApiOperation(value = "修改会员积分")
public R<MerMemberInfoVo> editMemberIntegral(@RequestBody MgtMemberIntEditDto mgtMemberIntEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -158,6 +163,7 @@
}
@RequestMapping(value = "/editMemberArchiveFields", method = RequestMethod.POST)
+ @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "编辑会员档案")
@ApiOperation(value = "编辑会员档案")
public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -193,6 +199,7 @@
}
@RequestMapping(value = "/mgtReplayMemberSuggest", method = RequestMethod.POST)
+ @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "回复会员建议")
@ApiOperation(value = "平台回复会员建议")
public R mgtReplayMemberSuggest(@RequestBody MgtReplayMemberSuggestDto mgtReplayMemberSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -210,6 +217,7 @@
}
@RequestMapping(value = "/mgtEditMemberSuggestTag", method = RequestMethod.POST)
+ @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
@ApiOperation(value = "平台编辑会员建议标签")
public R mgtEditMemberSuggestTag(@RequestBody MgtTagMemberSuggestDto mgtTagMemberSuggestDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 3faacd8..c8dac50 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
@@ -76,6 +78,7 @@
}
@RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "编辑商户")
@ApiOperation(value = "平台编辑商户")
public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
Long userId = SecurityUtils.getUserId();
@@ -99,6 +102,7 @@
}
@RequestMapping(value = "/editMgtShopTag", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户标签")
@ApiOperation(value = "修改商户标签")
public R editMgtShopTag(@RequestBody MgtEditShopTagDto mgtEditShopTagDto) {
shopService.editShopTag(mgtEditShopTagDto);
@@ -106,6 +110,7 @@
}
@RequestMapping(value = "/terminateMgtCooperation", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
@ApiOperation(value = "终止合作")
public R terminateMgtCooperation(@RequestBody MgtTerminateCooperationDto mgtTerminateCooperationDto) {
Long userId = SecurityUtils.getUserId();
@@ -115,6 +120,7 @@
}
@RequestMapping(value = "/changeMgtCooperationTime", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改合作时间")
@ApiOperation(value = "修改合作时间")
public R changeMgtCooperationTime(@RequestBody MgtChangeCoopDto mgtChangeCoopDto) {
Long userId = SecurityUtils.getUserId();
@@ -134,6 +140,7 @@
}
@RequestMapping(value = "/editMgtShopProportion", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户分成")
@ApiOperation(value = "修改商户分成")
public R editMgtShopProportion(@RequestBody MgtShopProportionEditDto mgtShopProportionEditDto) {
mgtShopProportionEditDto.setUserId(SecurityUtils.getUserId());
@@ -167,6 +174,7 @@
}
@RequestMapping(value = "/mgtReplayShopSuggest", method = RequestMethod.POST)
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "回复商户建议")
@ApiOperation(value = "平台回复建议")
public R mgtReplayShopSuggest(@RequestBody MgtReplayShopSuggestDto mgtReplayShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -183,7 +191,8 @@
}
@RequestMapping(value = "/mgtEditShopSuggestTag", method = RequestMethod.POST)
- @ApiOperation(value = "平台编辑会员建议标签")
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "编辑商户建议标签")
+ @ApiOperation(value = "平台编辑商户建议标签")
public R mgtEditShopSuggestTag(@RequestBody MgtTagShopSuggestDto mgtTagShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
mgtTagShopSuggestDto.setUserId(userId);
@@ -204,6 +213,7 @@
}
@RequestMapping(value = "/mgtAuditShopCertificate", method = RequestMethod.POST)
+ @Log(title = "商户证书管理", businessType = BusinessType.UPDATE,operContent = "审核商户证书")
@ApiOperation(value = "平台审核商户证书")
public R mgtAuditShopCertificate(@RequestBody MgtAuditShopCertificateDto mgtAuditShopCertificateDto) {
Long userId = SecurityUtils.getUserId();
@@ -233,6 +243,7 @@
}
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
public R mgtShopAuth(@RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
@@ -249,7 +260,7 @@
}
@RequestMapping(value = "/getMgtShopAuthCode", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户进件信息")
+ @ApiOperation(value = "获取商户进件验证信息")
public R<MgtShopAuthCodeVo> getMgtShopAuthCode(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto) {
MgtShopAuthCodeVo mgtShopAuthCodeVo = shopService.getMgtShopAuthCode(mgtShopAuthGetDto.getAuthId());
return R.ok(mgtShopAuthCodeVo);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
index 8f5eb37..8688535 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
@@ -1,6 +1,8 @@
package com.ruoyi.shop.controller.management;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
@@ -47,6 +49,7 @@
private MemberTaskRecordService memberTaskRecordService;
@RequestMapping(value = "/followShopTask", method = RequestMethod.POST)
+ @Log(title = "跟进管理", businessType = BusinessType.UPDATE,operContent = "商户跟进")
@ApiOperation(value = "商户跟进")
public R followShopTask(@RequestBody MgtFollowShopTaskDto mgtFollowShopTaskDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index f0c77b7..ce11ce1 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -9,7 +9,6 @@
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.mapper.task.MemberTaskRecordMapper;
-import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
@@ -36,8 +35,6 @@
@Resource
private TaskFileService taskFileService;
- @Resource
- private ShopService shopService;
/**
* 商户分页获取会员跟进任务
* @param page
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index f7eefd8..fc6e744 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -32,8 +32,6 @@
@Service
public class ShopTaskServiceImpl extends ServiceImpl<ShopTaskMapper, ShopTask> implements ShopTaskService {
- @Resource
- private ShopTaskMapper shopTaskMapper;
@Resource
private ShopTaskRecordService shopTaskRecordService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index f289552..808e0fa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
@@ -85,6 +87,7 @@
}
@RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
+ @Log(title = "申请合作管理", businessType = BusinessType.UPDATE,operContent = "修改申请合作")
@ApiOperation(value = "修改申请合作")
public R editCooperation(@RequestBody MgtCooperationEditDto mgtCooperationEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -94,6 +97,7 @@
}
@RequestMapping(value = "/editServiceMobile", method = RequestMethod.POST)
+ @Log(title = "客服电话管理", businessType = BusinessType.UPDATE,operContent = "修改客服电话")
@ApiOperation(value = "修改客服电话")
public R editServiceMobile(@RequestBody MgtServiceMobileEditDto mgtServiceMobileEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -103,6 +107,7 @@
}
@RequestMapping(value = "/editAgreement", method = RequestMethod.POST)
+ @Log(title = "协议管理", businessType = BusinessType.UPDATE,operContent = "修改协议")
@ApiOperation(value = "修改协议")
public R editAgreement(@RequestBody MgtAgreementEditDto mgtAgreementEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -112,6 +117,7 @@
}
@RequestMapping(value = "/editBanner", method = RequestMethod.POST)
+ @Log(title = "banner管理", businessType = BusinessType.UPDATE,operContent = "修改banner")
@ApiOperation(value = "修改banner")
public R editBanner(@RequestBody MgtBannerEditDto mgtBannerEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -142,6 +148,7 @@
}
@RequestMapping(value = "/deleteBanner", method = RequestMethod.POST)
+ @Log(title = "banner管理", businessType = BusinessType.DELETE,operContent = "删除banner")
@ApiOperation(value = "删除banner")
public R deleteBanner(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -163,6 +170,7 @@
}
@RequestMapping(value = "/editPop", method = RequestMethod.POST)
+ @Log(title = "弹窗管理", businessType = BusinessType.UPDATE,operContent = "修改弹窗广告")
@ApiOperation(value = "修改弹窗广告")
public R editPop(@RequestBody MgtPopEditDto mgtPopEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -181,6 +189,7 @@
}
@RequestMapping(value = "/deletePop", method = RequestMethod.POST)
+ @Log(title = "弹窗管理", businessType = BusinessType.DELETE,operContent = "删除弹窗广告")
@ApiOperation(value = "删除弹窗广告")
public R deletePop(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -202,6 +211,7 @@
}
@RequestMapping(value = "/editQuickEntry", method = RequestMethod.POST)
+ @Log(title = "快速入口管理", businessType = BusinessType.UPDATE,operContent = "修改快速入口")
@ApiOperation(value = "修改快速入口")
public R editQuickEntry(@RequestBody MgtQuickEntryEditDto mgtQuickEntryEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -220,6 +230,7 @@
}
@RequestMapping(value = "/deleteQuickEntry", method = RequestMethod.POST)
+ @Log(title = "快速入口管理", businessType = BusinessType.DELETE,operContent = "删除快速入口")
@ApiOperation(value = "删除快速入口")
public R deleteQuickEntry(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -236,6 +247,7 @@
}
@RequestMapping(value = "/editOtherConfig", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改其它设置")
@ApiOperation(value = "修改其它设置")
public R editOtherConfig(@RequestBody MgtOtherConfigEditDto mgtOtherConfigEditDto) {
customConfigService.editOtherConfig(mgtOtherConfigEditDto);
@@ -243,6 +255,7 @@
}
@RequestMapping(value = "/editShopConfig", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改合作商配置")
@ApiOperation(value = "修改合作商配置")
public R editShopConfig(@RequestBody MgtShopConfigEditDto mgtShopConfigEditDto) {
customConfigService.editShopConfig(mgtShopConfigEditDto);
@@ -250,13 +263,15 @@
}
@RequestMapping(value = "/editMemberConfig", method = RequestMethod.POST)
- @ApiOperation(value = "修改合作商配置")
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改会员配置")
+ @ApiOperation(value = "修改会员配置")
public R editMemberConfig(@RequestBody MgtMemberConfigEditDto mgtMemberConfigEditDto) {
customConfigService.editMemberConfig(mgtMemberConfigEditDto);
return R.ok();
}
@RequestMapping(value = "/editAdvert", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改广告配置")
@ApiOperation(value = "修改广告配置")
public R editAdvert(@RequestBody MgtAdvertEditDto mgtAdvertEditDto) {
mgtAdvertEditDto.setUserId(SecurityUtils.getUserId());
@@ -265,6 +280,7 @@
}
@RequestMapping(value = "/editActiveness", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改活跃度")
@ApiOperation(value = "修改活跃度")
public R editActiveness(@RequestBody MgtActivenessEditDto mgtActivenessEditDto) {
mgtActivenessEditDto.setUserId(SecurityUtils.getUserId());
@@ -273,6 +289,7 @@
}
@RequestMapping(value = "/deleteActiveness", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.DELETE,operContent = "删除活跃度")
@ApiOperation(value = "删除活跃度")
public R deleteMgtActiveness(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -293,6 +310,7 @@
}
@RequestMapping(value = "/editClassification", method = RequestMethod.POST)
+ @Log(title = "分类管理", businessType = BusinessType.UPDATE,operContent = "修改分类")
@ApiOperation(value = "修改分类")
public R editClassification(@RequestBody MgtClassificationEditDto mgtClassificationEditDto) {
mgtClassificationEditDto.setUserId(SecurityUtils.getUserId());
@@ -301,6 +319,7 @@
}
@RequestMapping(value = "/deleteClassification", method = RequestMethod.POST)
+ @Log(title = "分类管理", businessType = BusinessType.DELETE,operContent = "删除分类")
@ApiOperation(value = "删除分类")
public R deleteClassification(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -365,6 +384,7 @@
}
@RequestMapping(value = "/editTag", method = RequestMethod.POST)
+ @Log(title = "标签管理", businessType = BusinessType.UPDATE,operContent = "修改标签")
@ApiOperation(value = "修改标签")
public R editTag(@RequestBody MgtTagEditDto mgtTagEditDto) {
mgtTagEditDto.setUserId(SecurityUtils.getUserId());
@@ -373,6 +393,7 @@
}
@RequestMapping(value = "/deleteTag", method = RequestMethod.POST)
+ @Log(title = "标签管理", businessType = BusinessType.DELETE,operContent = "删除标签")
@ApiOperation(value = "删除标签")
public R deleteTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -393,6 +414,7 @@
}
@RequestMapping(value = "/editArticle", method = RequestMethod.POST)
+ @Log(title = "文章管理", businessType = BusinessType.UPDATE,operContent = "修改文章")
@ApiOperation(value = "修改文章")
public R editArticle(@RequestBody MgtArticleEditDto mgtArticleEditDto) {
mgtArticleEditDto.setUserId(SecurityUtils.getUserId());
@@ -401,6 +423,7 @@
}
@RequestMapping(value = "/deleteArticle", method = RequestMethod.POST)
+ @Log(title = "文章管理", businessType = BusinessType.DELETE,operContent = "删除文章")
@ApiOperation(value = "删除文章")
public R deleteArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
@@ -436,7 +459,8 @@
}
@RequestMapping(value = "/allotRecommend", method = RequestMethod.POST)
- @ApiOperation(value = "删除文章")
+ @Log(title = "分配管理", businessType = BusinessType.UPDATE,operContent = "分配推荐")
+ @ApiOperation(value = "分配推荐")
public R allotRecommend(@RequestBody MgtAllotRecommendDto mgtAllotRecommendDto) {
mgtAllotRecommendDto.setUserId(SecurityUtils.getUserId());
recommendCooperationService.allotRecommend(mgtAllotRecommendDto);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index 85135b0..5bca46f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.*;
@@ -85,6 +87,7 @@
}
@RequestMapping(value = "/mgtReplayStaffSuggest", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "平台回复会员建议")
@ApiOperation(value = "平台回复会员建议")
public R mgtReplayStaffSuggest(@RequestBody MgtReplayStaffSuggestDto mgtReplayStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -101,6 +104,7 @@
}
@RequestMapping(value = "/mgtEditStaffSuggestTag", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
@ApiOperation(value = "平台编辑会员建议标签")
public R mgtEditStaffSuggestTag(@RequestBody MgtTagStaffSuggestDto mgtTagStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -122,6 +126,7 @@
}
@RequestMapping(value = "/mgtEditStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.UPDATE,operContent = "编辑员工")
@ApiOperation(value = "平台编辑员工")
public R mgtEditStaff(@RequestBody MgtStaffEditDto mgtStaffEditDto) {
Long userId = SecurityUtils.getUserId();
@@ -131,6 +136,7 @@
}
@RequestMapping(value = "/mgtDeleteStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.DELETE,operContent = "删除员工")
@ApiOperation(value = "平台删除员工")
public R mgtStaffEdit(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
index ccab470..2e60015 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysDeptController.java
@@ -67,7 +67,7 @@
* 新增部门
*/
@RequiresPermissions("system:dept:add")
- @Log(title = "部门管理", businessType = BusinessType.INSERT)
+ @Log(title = "部门管理", businessType = BusinessType.INSERT,operContent = "新增部门")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
@@ -85,7 +85,7 @@
* 修改部门
*/
@RequiresPermissions("system:dept:edit")
- @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+ @Log(title = "部门管理", businessType = BusinessType.UPDATE,operContent = "修改部门")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
@@ -111,7 +111,7 @@
* 删除部门
*/
@RequiresPermissions("system:dept:remove")
- @Log(title = "部门管理", businessType = BusinessType.DELETE)
+ @Log(title = "部门管理", businessType = BusinessType.DELETE,operContent = "删除部门")
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
index d1002e9..0618602 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
@@ -107,7 +107,7 @@
* 新增菜单
*/
@RequiresPermissions("system:menu:add")
- @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+ @Log(title = "菜单管理", businessType = BusinessType.INSERT,operContent = "新增菜单")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
@@ -127,7 +127,7 @@
* 修改菜单
*/
@RequiresPermissions("system:menu:edit")
- @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+ @Log(title = "菜单管理", businessType = BusinessType.UPDATE,operContent = "修改菜单")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
@@ -151,7 +151,7 @@
* 删除菜单
*/
@RequiresPermissions("system:menu:remove")
- @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+ @Log(title = "菜单管理", businessType = BusinessType.DELETE,operContent = "删除菜单")
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index c516332..94d66d4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -376,6 +376,7 @@
}
@ApiOperation(value = "修改用户权限")
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE,operContent = "修改用户权限")
@PostMapping("/editUserMenu")
public R editUserMenu(@RequestBody UserMenuEditDto userMenuEditDto){
userService.editUserMenu(userMenuEditDto);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
index 27ac5e0..99808fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.dto.MgtStaffEditDto;
@@ -98,7 +100,14 @@
public void mgtStaffEdit(MgtStaffEditDto mgtStaffEditDto){
SysStaff sysStaff;
SysUser sysUser;
+ LambdaQueryWrapper<SysStaff> queryWrapper = new LambdaQueryWrapper();
+ queryWrapper.eq(SysStaff::getDelFlag,0);
+ queryWrapper.eq(SysStaff::getStaffMobile,mgtStaffEditDto.getStaffMobile());
+ SysStaff sysStaffSame = this.getOne(queryWrapper, false);
if(mgtStaffEditDto.getSysUserId()!=null){
+ if(sysStaffSame!=null&&!sysStaffSame.getUserId().equals(mgtStaffEditDto.getSysUserId())){
+ throw new ServiceException(AppErrorConstant.STAFF_MOBILE_DOUBLE);
+ }
sysStaff = this.getByUserId(mgtStaffEditDto.getSysUserId());
sysUser = sysUserService.selectUserById(mgtStaffEditDto.getSysUserId());
sysUser.setUserName(mgtStaffEditDto.getStaffMobile());
@@ -108,6 +117,9 @@
sysUser.setEmail(mgtStaffEditDto.getStaffEmail());
sysUserService.updateOnlyUser(sysUser);
}else{
+ if(sysStaffSame!=null){
+ throw new ServiceException(AppErrorConstant.STAFF_MOBILE_DOUBLE);
+ }
sysStaff = new SysStaff();
String staffId = IdUtils.simpleUUID();
sysStaff.setStaffId(staffId);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
index ded832c..2fd5936 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysMenuService.java
@@ -25,7 +25,7 @@
/**
* 根据用户查询系统菜单列表
*
- * @param userId 用户ID
+ * @param deptId 用户ID
* @return 菜单列表
*/
public List<SysMenu> selectDeptMenuList(Long deptId);
--
Gitblit v1.7.1