fix: 用户管理回显上级csmuserId

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -234,4 +234,9 @@ public class UserVO implements Serializable {
 	@TableField(exist = false)
 	private List<WmQuizResultModel> quizResult;
 
+	/**
+	 * 上级主管
+	 */
+	private List<Integer> parentIdList;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -24,6 +24,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
+import com.qunzhixinxi.hnqz.admin.entity.SysCsmUserRelation;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
@@ -88,6 +89,7 @@ public class SysUserController {
 	private final SysUserSubService sysUserSubService;
 	private final SysDictItemService sysDictItemService;
 	private final WmPlatformQuizTestResultService platformQuizTestResultService;
+	private final SysCsmUserRelationMapper sysCsmUserRelationMapper;
 
 
 	private boolean isZbOrDbUsers(Integer[] roles) {
@@ -1071,6 +1073,14 @@ public class SysUserController {
 			locations = list.stream().map(item -> Enum.valueOf(SubjectLocation.class, item.getValue())).collect(Collectors.toList());
 		}
 
+		Map<Integer, List<SysCsmUserRelation>> csmParentUserMap = new HashMap<>();
+		if (CollUtil.isNotEmpty(userIds)) {
+			// 上级csm
+			List<SysCsmUserRelation> csmUserRelations = sysCsmUserRelationMapper.selectList(Wrappers.<SysCsmUserRelation>lambdaQuery()
+					.in(SysCsmUserRelation::getUserId, userIds));
+			csmParentUserMap.putAll(csmUserRelations.stream().collect(Collectors.groupingBy(SysCsmUserRelation::getUserId)));
+		}
+
 		userVosPage.getRecords().forEach(userVO -> {
 			// 查询所属企业渠道
 			SysDeptSub sysDeptSub = new SysDeptSub();
@@ -1132,6 +1142,11 @@ public class SysUserController {
 				}
 			}
 
+			// 上级csm
+			List<SysCsmUserRelation> csmUserRelations = csmParentUserMap.get(userVO.getUserId());
+			if (CollUtil.isNotEmpty(csmUserRelations)) {
+				userVO.setParentIdList(csmUserRelations.stream().map(SysCsmUserRelation::getParentId).collect(Collectors.toList()));
+			}
 		});
 
 		return R.ok(userVosPage);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -481,7 +481,7 @@ public class WmPayOffController {
 	 */
 	@ResponseExcel(name = "exportPackageSettle", sheet = "积分包结算数据")
 	@SysLog("积分包结算导出")
-	@GetMapping("/exportPackageSettle")
+	@PostMapping("/exportPackageSettle")
 	public List<WmScorePackageSettleExcelModel> exportPackageSettle(WmScorePackageSettleInput input) {
 
 		if (input.getSendPackageDeptId() == null) {