经销商查看部门内数据

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/mapper/CorpsDescMapper.xml

@@ -99,6 +99,9 @@
         <if test="corpsDesc.checkStatus != null and corpsDesc.checkStatus != ''">
             and check_status = #{corpsDesc.checkStatus}
         </if>
+        <if test="corpsDesc.createDept != null and corpsDesc.createDept != ''">
+            and create_dept = #{corpsDesc.createDept}
+        </if>
         <if test="corpsDesc.cname!=null and corpsDesc.cname != ''">
             and (cname like CONCAT(CONCAT('%', #{corpsDesc.cname}), '%') or tel like CONCAT(CONCAT('%',
             #{corpsDesc.cname}), '%'))

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/corp/controller/AppCorpsDescController.java

@@ -22,6 +22,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;
@@ -65,14 +66,16 @@ public class AppCorpsDescController extends BladeController {
 	 */
 	@GetMapping("/list")
 	public R<IPage<AppCorpsDescVO>> list(AppCorpsDescVO corpsDesc, Query query) {
+		BladeUser selectedUser = AuthUtil.getUser();
 		LambdaQueryWrapper<AppPjCorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(AppPjCorpsDesc::getTenantId, AuthUtil.getTenantId())
+		lambdaQueryWrapper.eq(AppPjCorpsDesc::getTenantId, selectedUser.getTenantId())
 			.eq(AppPjCorpsDesc::getIsDeleted, 0)
 			.and(ObjectUtils.isNotNull(corpsDesc.getRetrieve()), i -> i.like(AppPjCorpsDesc::getCname, corpsDesc.getRetrieve()).or()
 				.like(AppPjCorpsDesc::getTel, corpsDesc.getRetrieve()));
 		if (AuthUtil.getUserRole().contains("dealer")) {
-			lambdaQueryWrapper.and(i -> i.like(AppPjCorpsDesc::getSrcDistributorId, AuthUtil.getUserId()).or()
-				.isNull(AppPjCorpsDesc::getSrcDistributorId));
+/*			lambdaQueryWrapper.and(i -> i.like(AppPjCorpsDesc::getSrcDistributorId, AuthUtil.getUserId()).or()
+				.isNull(AppPjCorpsDesc::getSrcDistributorId));*/
+			lambdaQueryWrapper.eq(AppPjCorpsDesc::getCreateDept, selectedUser.getDeptId());
 		}
 		lambdaQueryWrapper.orderByDesc(AppPjCorpsDesc::getCreateTime);
 		IPage<AppPjCorpsDesc> pages = corpsDescService.page(Condition.getPage(query), lambdaQueryWrapper);
@@ -82,7 +85,7 @@ public class AppCorpsDescController extends BladeController {
 			voPage = AppCorpsWrapper.build().pageVO(pages);
 			List<Long> idList = pages.getRecords().stream().map(AppPjCorpsDesc::getId).collect(Collectors.toList());
 			List<AppPjCorpsFiles> filesList = corpsFilesService.list(new LambdaQueryWrapper<AppPjCorpsFiles>()
-				.eq(AppPjCorpsFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(AppPjCorpsFiles::getTenantId, selectedUser.getTenantId())
 				.eq(AppPjCorpsFiles::getIsDeleted, 0)
 				.in(AppPjCorpsFiles::getPid, idList)
 				.eq(AppPjCorpsFiles::getMainImage, "1"));