2023年9月4日12:49:12

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java

@@ -52,7 +52,7 @@ import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/oss")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 @Api(value = "对象存储接口", tags = "对象存储接口")
 public class OssController extends BladeController {
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/SmsController.java

@@ -52,7 +52,7 @@ import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/sms")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 @Api(value = "短信配置表", tags = "短信配置表接口")
 public class SmsController extends BladeController {
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -63,7 +63,7 @@ public class OssEndpoint {
 	 */
 	@SneakyThrows
 	@PostMapping("/make-bucket")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R makeBucket(@RequestParam("bucketName") String bucketName) {
 		ossBuilder.template().makeBucket(bucketName);
 		return R.success("创建成功");
@@ -77,7 +77,7 @@ public class OssEndpoint {
 	 */
 	@SneakyThrows
 	@PostMapping("/remove-bucket")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R removeBucket(@RequestParam("bucketName") String bucketName) {
 		ossBuilder.template().removeBucket(bucketName);
 		return R.success("删除成功");
@@ -262,7 +262,7 @@ public class OssEndpoint {
 	 */
 	@SneakyThrows
 	@PostMapping("/remove-file")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R removeFile(@RequestParam String fileName) {
 		ossBuilder.template().removeFile(fileName);
 		return R.success("操作成功");
@@ -276,7 +276,7 @@ public class OssEndpoint {
 	 */
 	@SneakyThrows
 	@PostMapping("/remove-files")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R removeFiles(@RequestParam String fileNames) {
 		ossBuilder.template().removeFiles(Func.toStrList(fileNames));
 		return R.success("操作成功");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/controller/AccountManagementController.java

@@ -33,6 +33,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.salesPart.entity.PjAccountManagement;
 import org.springblade.salesPart.entity.PjProductLaunch;
+import org.springblade.salesPart.entity.PjStorageDesc;
 import org.springblade.salesPart.vo.AccountManagementVO;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -74,14 +75,16 @@ public class AccountManagementController extends BladeController {
 		LambdaQueryWrapper<PjAccountManagement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjAccountManagement::getTenantId, AuthUtil.getTenantId())
 			.eq(PjAccountManagement::getIsDeleted, 0)
-			.eq(PjAccountManagement::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.eq(PjAccountManagement::getCorporateName, AuthUtil.getDeptId())//公司
 			.like(StringUtils.isNotBlank(accountManagement.getCname()), PjAccountManagement::getCname, accountManagement.getCname())//客户名称
 			.eq(StringUtils.isNotBlank(accountManagement.getAccountType()), PjAccountManagement::getAccountType, accountManagement.getAccountType())//账户类型
 			.like(StringUtils.isNotBlank(accountManagement.getBankDeposit()), PjAccountManagement::getBankDeposit, accountManagement.getBankDeposit())//账户类型
 			.eq(StringUtils.isNotBlank(accountManagement.getCurrency()), PjAccountManagement::getCurrency, accountManagement.getCurrency())//账户类型
 			.eq(StringUtils.isNotBlank(accountManagement.getStatus()), PjAccountManagement::getStatus, accountManagement.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(accountManagement.getEnableOrNot()), PjAccountManagement::getEnableOrNot, accountManagement.getEnableOrNot());//状态
+		if (AuthUtil.getUserRole().contains("管理员")) {
+			lambdaQueryWrapper.eq(PjAccountManagement::getSalesCompanyId, AuthUtil.getDeptId())
+				.eq(PjAccountManagement::getCorporateName, AuthUtil.getDeptId());//公司
+		}
 		IPage<PjAccountManagement> pages = accountManagementService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -325,7 +325,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 				//获得所属公司
 				if (StringUtil.isNotBlank(e.getSalesCompanyName())) {
 					R<Dept> dept = iSysClient.getDeptIByName(AuthUtil.getTenantId(), e.getSalesCompanyName());
-					if (ObjectUtil.isNotEmpty(dept)) {
+					if (dept.isSuccess() && ObjectUtil.isNotEmpty(dept.getData())) {
 						goodsDesc.setSalesCompanyId(dept.getData().getId());
 						goodsDesc.setSalesCompanyName(dept.getData().getFullName());
 					} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -124,7 +124,7 @@ public class OrderController extends BladeController {
 		} else {
 			lambdaQueryWrapper.ne(ObjectUtils.isNotEmpty(order.getActualPaymentStatus()), PjOrder::getActualPaymentStatus, order.getActualPaymentStatus());//来源单号
 		}
-		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND actual_payment_status = 2 ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+//		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND actual_payment_status = 2 ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 
 		if (AuthUtil.getUserRole().contains("业务员")) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -368,7 +368,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						if (ObjectUtil.isNotEmpty(stockDesc)) {
 							item.setCostprie(item.getGoodsNum().multiply(stockDesc.getInventoryCostPrice()));
 						} else {
-							throw new RuntimeException("未查询到库存账信息");
+							throw new RuntimeException("未查到库存信息 原因: 仓库、产品批次号 是否正确，请核对!!!");
 						}
 
 					} else {//共享仓取共享上架的共享成本

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -80,7 +80,8 @@
             LEFT JOIN pjpf_goods_desc pgd ON pgd.id = psi.goods_id
         WHERE
              ps.is_deleted = '0'
-          AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD' )
+            and psi.is_deleted = '0'
+        AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD' )
             AND ps.tenant_id = #{order.tenantId}
           AND FIND_IN_SET( ps.status_name, '已入库,已出库' )
         <if test="order.dot!=null and order.dot!=''">

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -1052,7 +1052,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			LambdaQueryWrapper<PjGoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 				.eq(PjGoodsDesc::getIsDeleted, 0)
-				.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())
+//				.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())
 				.eq(PjGoodsDesc::getCname, itemExcel.getGoodsName());
 			PjGoodsDesc goodsDesc = goodsDescMapper.selectOne(lambdaQueryWrapper);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/storage/controller/StorageDescController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
@@ -43,7 +44,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- *  配件批发仓库控制器
+ * 配件批发仓库控制器
  *
  * @author BladeX
  * @since 2023-04-21
@@ -78,7 +79,6 @@ public class StorageDescController extends BladeController {
 		LambdaQueryWrapper<PjStorageDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjStorageDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjStorageDesc::getIsDeleted, 0)
-			.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.like(ObjectUtils.isNotEmpty(storageDesc.getCode()), PjStorageDesc::getCode, storageDesc.getCode())//仓库编码
 			.like(ObjectUtils.isNotEmpty(storageDesc.getCname()), PjStorageDesc::getCname, storageDesc.getCname())//仓库名称
 			.like(ObjectUtils.isNotEmpty(storageDesc.getContacts()), PjStorageDesc::getContacts, storageDesc.getContacts())//联系人
@@ -88,6 +88,9 @@ public class StorageDescController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(storageDesc.getSalesCompanyId()), PjStorageDesc::getSalesCompanyId, storageDesc.getSalesCompanyId())//所属公司
 			.in(ObjectUtils.isNotEmpty(storageDesc.getSharedCompany()), PjStorageDesc::getSharedCompany, storageDesc.getSharedCompany());//共享公司
 
+		if (AuthUtil.getUserRole().contains("管理员")) {
+			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
+		}
 		/*String role = AuthUtil.getUserRole();
 		if (!role.contains("admin")){
 			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
@@ -138,7 +141,7 @@ public class StorageDescController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入storageDesc")
 	public R submit(@Valid @RequestBody PjStorageDesc storageDesc) {
-		if (StringUtils.isNotBlank(storageDesc.getTenantId())){
+		if (StringUtils.isNotBlank(storageDesc.getTenantId())) {
 			storageDesc.setTenantId(AuthUtil.getTenantId());
 		}
 		PjStorageDesc desc = storageDescService.saveMessage(storageDesc);

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -18,6 +18,7 @@ package org.springblade.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
@@ -46,8 +47,10 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 
@@ -61,7 +64,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 @AllArgsConstructor
 @RequestMapping("/dept")
 @Api(value = "部门", tags = "部门")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 public class DeptController extends BladeController {
 
 	private final IDeptService deptService;
@@ -209,7 +212,7 @@ public class DeptController extends BladeController {
 	@PreAuth(AuthConstant.PERMIT_ALL)
 	public R<Dept> topList() {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
-		if (ObjectUtil.isEmpty(dept)){
+		if (ObjectUtil.isEmpty(dept)) {
 			throw new RuntimeException("数据异常请联系管理员");
 		}
 		return R.data(dept);
@@ -226,7 +229,7 @@ public class DeptController extends BladeController {
 			.eq(Dept::getParentId, 0)
 			.eq(Dept::getTenantId, AuthUtil.getTenantId())
 			.eq(Dept::getIsDeleted, 0)
-			.ne(Dept::getId ,AuthUtil.getDeptId())
+			.ne(Dept::getId, AuthUtil.getDeptId())
 		);
 		return R.data(DeptWrapper.build().listNodeVO(list));
 	}

blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -57,7 +57,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 @AllArgsConstructor
 @RequestMapping("/role")
 @Api(value = "角色", tags = "角色")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 public class RoleController extends BladeController {
 
 	private final IRoleService roleService;

blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -68,7 +68,7 @@ public class TenantController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入tenant")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<Tenant> detail(Tenant tenant) {
 		Tenant detail = tenantService.getOne(Condition.getQueryWrapper(tenant));
 		return R.data(detail);
@@ -85,7 +85,7 @@ public class TenantController extends BladeController {
 	})
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入tenant")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
 		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
 		IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -98,7 +98,7 @@ public class TenantController extends BladeController {
 	@GetMapping("/select")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "下拉数据源", notes = "传入tenant")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
 		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
 		List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -111,7 +111,7 @@ public class TenantController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "分页", notes = "传入tenant")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<Tenant>> page(Tenant tenant, Query query) {
 		IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
 		return R.data(pages);
@@ -171,7 +171,7 @@ public class TenantController extends BladeController {
 	@GetMapping("/find-by-name")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "详情", notes = "传入tenant")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<List<Tenant>> findByName(String name) {
 		List<Tenant> list = tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name));
 		return R.data(list);

blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java

@@ -51,7 +51,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 @AllArgsConstructor
 @RequestMapping("/topmenu")
 @Api(value = "顶部菜单表", tags = "顶部菜单")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 public class TopMenuController extends BladeController {
 
 	private final ITopMenuService topMenuService;

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java

@@ -47,7 +47,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> tree(String tenantId);
+	List<DeptVO> tree(@Param("tenantId") String tenantId,@Param("id")Long id);
 
 	/**
 	 * 懒加载获取树形节点
@@ -56,7 +56,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 * @param parentId
 	 * @return
 	 */
-	List<DeptVO> lazyTree(String tenantId, Long parentId);
+	List<DeptVO> lazyTree(String tenantId, Long parentId,Long id);
 
 	/**
 	 * 获取树形节点

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -68,8 +68,11 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
         select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
-        <if test="_parameter!=null and _parameter!=''">
-            and tenant_id = #{_parameter}
+        <if test="tenantId!=null and tenantId!=''">
+            and tenant_id = #{tenantId}
+        </if>
+        <if test="id!=null">
+            and id = #{id}
         </if>
         ORDER BY sort
     </select>
@@ -96,6 +99,9 @@
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>
+        <if test="param3!=null">
+            and dept.id = #{param3}
+        </if>
         ORDER BY dept.sort
     </select>
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -17,6 +17,7 @@
 package org.springblade.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.log.exception.ServiceException;
@@ -83,7 +84,15 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	@Override
 	public List<DeptVO> tree(String tenantId) {
-		return ForestNodeMerger.merge(baseMapper.tree(tenantId));
+		List<DeptVO> tree = null;
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				tree = baseMapper.tree(tenantId, Long.parseLong(AuthUtil.getDeptId()));
+			}
+		} else {
+			tree = baseMapper.tree(tenantId, null);
+		}
+		return ForestNodeMerger.merge(tree);
 	}
 
 	@Override
@@ -91,7 +100,15 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (AuthUtil.isAdministrator()) {
 			tenantId = StringPool.EMPTY;
 		}
-		return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
+		List<DeptVO> tree = null;
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(AuthUtil.getDeptId()));
+			}
+		} else {
+			tree = baseMapper.lazyTree(tenantId, parentId, null);
+		}
+		return ForestNodeMerger.merge(tree);
 	}
 
 	@Override

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -88,7 +88,7 @@ public class UserController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查看详情", notes = "传入id")
 	@GetMapping("/detail")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<UserVO> detail(User user) {
 		if (ObjectUtils.isNotNull(user.getId())) {
 			User detail = userService.getOne(Condition.getQueryWrapper(user));
@@ -253,7 +253,7 @@ public class UserController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表", notes = "传入account和realName")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
 		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
 		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -282,7 +282,7 @@ public class UserController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增或修改", notes = "传入User")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R submit(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
 		boolean status = userService.submit(user);
@@ -309,7 +309,7 @@ public class UserController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "删除", notes = "传入id集合")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R remove(@RequestParam String ids) {
 		CacheUtil.clear(USER_CACHE);
 		boolean status = userService.removeUser(ids);
@@ -323,7 +323,7 @@ public class UserController {
 	@PostMapping("/grant")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R grant(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
 				   @ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds) {
 		boolean temp = userService.grant(userIds, roleIds);
@@ -336,7 +336,7 @@ public class UserController {
 	@PostMapping("/reset-password")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "初始化密码", notes = "传入userId集合")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 //	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
 	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
 						   @ApiParam(value = "密码", readOnly = true) @RequestParam(value = "newPassword") String password) {
@@ -455,7 +455,7 @@ public class UserController {
 	@ApiOperationSupport(order = 17)
 	@ApiOperation(value = "查看平台详情", notes = "传入id")
 	@GetMapping("/platform-detail")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<UserVO> platformDetail(User user) {
 		return R.data(userService.platformDetail(user));
 	}

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.TenantConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -156,6 +155,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				deptId = Long.parseLong(AuthUtil.getDeptId());
+			}
+		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
 	}