经销商查看数据改为只查看自己部门下的数据而非创建人

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/controller/CorpsDescController.java

@@ -41,6 +41,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 
+/**
+ * @author Rain
+ */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/corpsDesc")

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/service/impl/CorpsDescServiceImpl.java

@@ -15,6 +15,7 @@ import com.gubersail.dealer.admin.api.corps.vo.CorpsDescVO;
 import com.gubersail.dealer.admin.api.excel.CorpsDescImportExcel;
 import com.gubersail.dealer.admin.api.goods.entity.PjBrandDesc;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
@@ -110,6 +111,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 	 */
 	@Override
 	public IPage<CorpsDescVO> selectCorpsDescPage(IPage<CorpsDescVO> page, CorpsDescVO corpsDesc) {
+		BladeUser selectedUser = AuthUtil.getUser();
 		//获取客户子类别
 		if (StringUtils.isNotBlank(corpsDesc.getCorpsTypeId())) {
 			Long corpsTypeId = Long.parseLong(corpsDesc.getCorpsTypeId());
@@ -121,7 +123,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 			LambdaQueryWrapper<PjCorpsType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjCorpsType::getCname, corpsDesc.getCorpsTypeName());
 			lambdaQueryWrapper.eq(PjCorpsType::getIsDeleted, 0);
-			lambdaQueryWrapper.eq(PjCorpsType::getTenantId, SecureUtil.getTenantId());
+			lambdaQueryWrapper.eq(PjCorpsType::getTenantId, selectedUser.getTenantId());
 			List<PjCorpsType> corpsTypeList = corpsTypeService.list(lambdaQueryWrapper);
 			if (CollectionUtils.isNotEmpty(corpsTypeList)) {
 				List<Long> corpsTypeIdList = new ArrayList<>();
@@ -132,20 +134,13 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				corpsDesc.setTypeList(corpsTypeIdList);
 			}
 		}
-		corpsDesc.setTenantId(AuthUtil.getTenantId());
+		corpsDesc.setTenantId(selectedUser.getTenantId());
 		corpsDesc.setIsDeleted(0);
-//		corpsDesc.setStrTenantId(Arrays.asList(AuthUtil.getDeptId().split(",")));
-		/*if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
-			&& !AuthUtil.getUserRole().contains("销售总览")) {
-			if (AuthUtil.getUserRole().contains("业务员")) {
-				corpsDesc.setSalesmanId(AuthUtil.getUserId());
-			}
-		}*/
 		if (!AuthUtil.getUserRole().contains("admin")) {
-			corpsDesc.setSrcDistributorId(AuthUtil.getUserId());
+			// corpsDesc.setSrcDistributorId(selectedUser.getUserId());
+			corpsDesc.setCreateDept(Long.valueOf(selectedUser.getDeptId()));
 		}
-		IPage<CorpsDescVO> page1 = page.setRecords(baseMapper.selectCorpsDescPage(page, corpsDesc));
-		return page1;
+		return page.setRecords(baseMapper.selectCorpsDescPage(page, corpsDesc));
 
 	}
 

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/corp/controller/ShopAppCorpsDescController.java

@@ -18,6 +18,7 @@ import org.springblade.common.annotation.RepeatSubmit;
 import org.springblade.core.boot.ctrl.BladeController;
 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.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
@@ -57,15 +58,17 @@ public class ShopAppCorpsDescController extends BladeController {
 	 */
 	@GetMapping("/list")
 	public R<IPage<ShopAppCorpsDescVO>> list(ShopAppCorpsDescVO corpsDesc, Query query) {
+		BladeUser selectedUser = AuthUtil.getUser();
 		LambdaQueryWrapper<ShopAppPjCorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(ShopAppPjCorpsDesc::getTenantId, AuthUtil.getTenantId())
+		lambdaQueryWrapper.eq(ShopAppPjCorpsDesc::getTenantId, selectedUser.getTenantId())
 			.eq(ShopAppPjCorpsDesc::getIsDeleted, 0)
 			.and(ObjectUtils.isNotNull(corpsDesc.getRetrieve()), i -> i.like(ShopAppPjCorpsDesc::getCname, corpsDesc.getRetrieve()).or()
 				.like(ShopAppPjCorpsDesc::getTel, corpsDesc.getRetrieve()))
 			.orderByAsc(ShopAppPjCorpsDesc::getCname);
 		if (AuthUtil.getUserRole().contains("dealer")) {
-			lambdaQueryWrapper.and(i -> i.like(ShopAppPjCorpsDesc::getSrcDistributorId, AuthUtil.getUserId()).or()
-				.isNull(ShopAppPjCorpsDesc::getSrcDistributorId));
+//			lambdaQueryWrapper.and(i -> i.like(ShopAppPjCorpsDesc::getSrcDistributorId, AuthUtil.getUserId()).or()
+//				.isNull(ShopAppPjCorpsDesc::getSrcDistributorId));
+			lambdaQueryWrapper.eq(ShopAppPjCorpsDesc::getCreateDept, selectedUser.getDeptId());
 		}
 		IPage<ShopAppPjCorpsDesc> pages = corpsDescService.page(Condition.getPage(query), lambdaQueryWrapper);
 		IPage<ShopAppCorpsDescVO> voPage = new Page<>();
@@ -74,7 +77,7 @@ public class ShopAppCorpsDescController extends BladeController {
 			voPage = ShopAppCorpsWrapper.build().pageVO(pages);
 			List<Long> idList = pages.getRecords().stream().map(ShopAppPjCorpsDesc::getId).collect(Collectors.toList());
 			List<ShopAppPjCorpsFiles> filesList = corpsFilesService.list(new LambdaQueryWrapper<ShopAppPjCorpsFiles>()
-				.eq(ShopAppPjCorpsFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(ShopAppPjCorpsFiles::getTenantId, selectedUser.getTenantId())
 				.eq(ShopAppPjCorpsFiles::getIsDeleted, 0)
 				.in(ShopAppPjCorpsFiles::getPid, idList)
 				.eq(ShopAppPjCorpsFiles::getMainImage, "1"));