From 56ce440159701f4154c69daca105fbe4641f95f9 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 01 九月 2025 23:37:23 +0800
Subject: [PATCH] 普通用户 试用期过后 不能删除修改等操作
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 9 +++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 11 +++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 9 +++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java | 27 ++++++++++++++++++++++++++-
4 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java
index 0117388..9eb7f30 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZExperience;
import com.ruoyi.service.ZExperienceService;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,11 @@
@Autowired
private ZExperienceService zExperienceService;
+ @Autowired
+ private ISysUserService iSysUserService;
+
+
+
@GetMapping("/all")
public AjaxResult listAll(){
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -61,6 +67,8 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+
+
List<ZExperience> list = zExperienceService.selectExperienceList(userId);
log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class);
@@ -78,10 +86,13 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ if(iSysUserService.findUserStatus(userId))
+ return AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
+
boolean flag=zExperienceService.importExcel(file,userId);
if(flag){
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
+ }else
return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
}
@@ -106,6 +117,10 @@
{
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+
+ if(iSysUserService.findUserStatus(userId))
+ return AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
+
zExperience.setUserId(userId);
return toAjax(zExperienceService.save(zExperience));
}
@@ -118,6 +133,11 @@
@PutMapping
public AjaxResult edit(@RequestBody ZExperience zExperience)
{
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+
+ if(iSysUserService.findUserStatus(userId))
+ return AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
return toAjax(zExperienceService.updateById(zExperience));
}
//
@@ -129,6 +149,11 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+
+ if(iSysUserService.findUserStatus(userId))
+ return AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
return toAjax(zExperienceService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 7ef58a1..8986bc9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -56,11 +56,12 @@
{
log.info("鐧诲綍鐢ㄦ埛锛歿} 寮傚父.", username);
throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 鍑虹幇寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }else if(UserStatus.END.getCode().equals(user.getStatus()))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 寮傚父.", username);
- throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 璇曠敤鏈熷凡缁撴潫锛岃浠樿垂缁х画浣跨敤");
}
+// else if(UserStatus.END.getCode().equals(user.getStatus()))
+// {
+// log.info("鐧诲綍鐢ㄦ埛锛歿} 寮傚父.", username);
+// throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 璇曠敤鏈熷凡缁撴潫锛岃浠樿垂缁х画浣跨敤");
+// }
passwordService.validate(user);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 7273e2b..deda0e7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -15,6 +15,15 @@
{
+ /**
+ * 鏌ユ壘鐢ㄦ埛鐘舵��
+ *
+ * @param userId 鐢ㄦ埛sys_id
+ * @return 鐢ㄦ埛璐﹀彿鐘舵��
+ */
+ Boolean findUserStatus(Long userId);
+
+
public List<String> findUserNames(Long [] ids);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index bb427f2..f198463 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -80,7 +80,18 @@
private ZInfoUserService zInfoUserService;
+ /**
+ * 鏌ユ壘鐢ㄦ埛鐘舵��
+ *
+ * @param userId 鐢ㄦ埛sys_id
+ * @return 鐢ㄦ埛璐﹀彿鐘舵��
+ */
+ @Override
+ public Boolean findUserStatus(Long userId) {
+ SysUser sysUser = userMapper.selectUserById(userId);
+ return sysUser.getStatus().equals("4");
+ }
@Override
public List<String> findUserNames(Long[] ids) {
--
Gitblit v1.9.1