java/qijisheng.git

			@@ -37,9 +37,7 @@
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -81,9 +79,14 @@
			public AjaxResult list() {
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = sysUserService.getById(userid);
			LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getDelFlag, 0).eq(SysRole::getStatus, 0);
			if(sysUser.getRoleType() == 2){
			LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
			.ne(SysRole::getRoleId, 2)
			.eq(SysRole::getDelFlag, 0)
			.eq(SysRole::getStatus, 0);
			if (sysUser.getRoleType() == 2) {
			wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
			}else {
			wrapper.isNull(SysRole::getShopId);
			}
			List<SysRole> list = roleService.list(wrapper);
			return AjaxResult.success(list);
			@@ -103,7 +106,10 @@
			SysUser sysUser = sysUserService.getById(userid);
			if(sysUser.getRoleType() == 2){
			wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
			}else{
			wrapper.isNull(SysRole::getShopId);
			}
			wrapper.ne(SysRole::getRoleId,2);//过滤门店管理员
			PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
			for (SysRole record : page.getRecords()) {
			long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
			@@ -120,7 +126,7 @@
			SysRole role = new SysRole();
			role.setRoleName(dto.getRoleName());
			LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
			.eq(SysRole::getRoleName, dto.getRoleName());
			.eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = sysUserService.getById(userid);
			if(sysUser.getRoleType() == 2){