经销商app查看理赔数据问题与新增经销商用户接口优化

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

@@ -633,7 +633,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	@Override
 	public boolean submitDealer(User user) {
 		BladeUser nowUser = AuthUtil.getUser();
-		User realUser = baseMapper.selectById(user.getId());
+		User realUser = baseMapper.selectById(nowUser.getUserId());
 		if (org.springframework.util.ObjectUtils.isEmpty(realUser)) {
 			return false;
 		}

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/claim/controller/AppClaimController.java

@@ -42,6 +42,7 @@ import org.springblade.common.utils.U9DateUtils;
 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.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -92,6 +93,7 @@ public class AppClaimController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入bladeClaim")
 	public R<IPage<AppClaimVO>> list(AppClaimVO bladeClaim, Query query) {
+		BladeUser nowSelectedUser = AuthUtil.getUser();
 		LambdaQueryWrapper<AppClaim> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(AppClaim::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(bladeClaim.getAuditStatus()), AppClaim::getAuditStatus, bladeClaim.getAuditStatus())
@@ -104,7 +106,8 @@ public class AppClaimController extends BladeController {
 			)
 			.orderByDesc(AppClaim::getCreateTime);
 		if (AuthUtil.getUserRole().contains("dealer")) {
-			lambdaQueryWrapper.eq(AppClaim::getDealerId, AuthUtil.getUserId());
+			// lambdaQueryWrapper.eq(AppClaim::getDealerId, AuthUtil.getUserId());
+			lambdaQueryWrapper.eq(AppClaim::getCreateDept, nowSelectedUser.getDeptId());
 		}
 		IPage<AppClaim> pages = bladeClaimService.page(Condition.getPage(query), lambdaQueryWrapper);
 		IPage<AppClaimVO> voPage = new Page<>();