Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-05-30 cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8

 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,13 +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) {
        Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
    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);
    }