From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
index ccce6ae..67cfafb 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.SystemPermissionMapper;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
@@ -11,6 +13,7 @@
import com.doumee.service.system.SystemPermissionService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -83,18 +86,27 @@
@Override
public SystemPermission findOne(SystemPermission systemPermission) {
- Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
- return systemPermissionMapper.selectOne(wrapper);
+ QueryWrapper<SystemPermission> wrapper = new QueryWrapper<SystemPermission>(systemPermission);
+ return systemPermissionMapper.selectOne(wrapper.last("limit 1"));
}
@Override
- public List<SystemPermission> findList(SystemPermission systemPermission) {
- QueryWrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
- if(systemPermission.getTypeList()!=null){
- wrapper.lambda().and(w->{w.isNull(SystemPermission::getType).or()
- .in(SystemPermission::getType,systemPermission.getTypeList());
- });
+ public List<SystemPermission> findList(SystemPermission systemPermission,Integer userType) {
+ if(userType !=null){
+ if(Constants.equalsInteger(userType,Constants.UserType.ZHUBO.getKey())){
+ systemPermission.setIsshop(Constants.ONE);
+ }else if(Constants.equalsInteger(userType,Constants.UserType.COMPANY.getKey())){
+ systemPermission.setIscom(Constants.ONE);
+ }else if(Constants.equalsInteger(userType,Constants.UserType.SYSTEM.getKey())){
+ systemPermission.setIsadmin(Constants.ONE);
+ }
}
+ QueryWrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
+// if(systemPermission.getTypeList()!=null){
+// wrapper.lambda().and(w->{w.isNull(SystemPermission::getType).or()
+// .in(SystemPermission::getType,systemPermission.getTypeList());
+// });
+// }
return systemPermissionMapper.selectList(wrapper);
}
--
Gitblit v1.9.3