仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java

@@ -18,7 +18,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -75,11 +74,6 @@ public class StStorageLocationController extends BladeController {
 		QueryWrapper<StStorageLocation> wrapper = Condition.getQueryWrapper(stStorageLocation, StStorageLocation.class);
 		wrapper.eq("is_deleted", 0);
 
-		// 数据权限：当前用户工厂
-		BladeUser user = AuthUtil.getUser();
-		if (user != null && user.getDeptId() != null) {
-			wrapper.eq("create_dept", user.getDeptId());
-		}
 		if (StringUtils.isBlank(query.getAscs()) && StringUtils.isBlank(query.getDescs())) {
 			wrapper.orderByDesc("create_time");
 		}
@@ -98,12 +92,6 @@ public class StStorageLocationController extends BladeController {
 		// 1. 软删除
 		stStorageLocation.setIsDeleted(0);
 
-		// 2. 数据权限：当前用户工厂
-		BladeUser user = AuthUtil.getUser();
-		if (user != null && user.getDeptId() != null) {
-			stStorageLocation.setDeptId(Long.valueOf(user.getDeptId()));
-		}
-
 		IPage<StStorageLocationVO> pages = stStorageLocationService.selectStStorageLocationPage(Condition.getPage(query), stStorageLocation);
 		return R.data(pages);
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java

@@ -96,11 +96,6 @@ public class StStorehouseController extends BladeController {
 		QueryWrapper<StStorehouse> wrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class);
 		// 1. 软删除过滤
 		wrapper.eq("is_deleted", 0);
-		// 2. 数据权限：当前用户工厂
-		BladeUser user = AuthUtil.getUser();
-		if (user != null && user.getDeptId() != null) {
-			wrapper.eq("create_dept", user.getDeptId());
-		}
 
 		if (StringUtils.isBlank(query.getAscs()) && StringUtils.isBlank(query.getDescs())) {
 			wrapper.orderByDesc("create_time");
@@ -155,12 +150,6 @@ public class StStorehouseController extends BladeController {
 		// 1. 软删除过滤
 		stStorehouse.setIsDeleted(0);
 
-		// 2. 数据权限：当前用户工厂
-		BladeUser user = AuthUtil.getUser();
-		if (user != null && user.getDeptId() != null) {
-			stStorehouse.setCreateDept(Long.valueOf(user.getDeptId()));
-		}
-
 		// 3. 默认排序（Query 的 asc/desc 字段）
 		if (StringUtils.isBlank(query.getAscs()) && StringUtils.isBlank(query.getDescs())) {
 			query.setAscs("sh_code");