Merge branch 'dev_group_msg' into develop

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java

@@ -27,8 +27,6 @@ public class GroupPointFormDTO implements Serializable {
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;
-	@NotBlank(message = "用户ID不能为空", groups = {MyGroupRank.class})
-	private String userId;
 
 	/** 页码 */
 	private Integer pageNo = 1;

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java

@@ -165,9 +165,9 @@ public class GroupPointController {
 	 * @date 2021.09.08 13:31:09
 	 */
 	@PostMapping("grouppointranking/mygroups")
-	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@RequestBody GroupPointFormDTO formDTO) {
+	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@LoginUser TokenDto loginInfo, @RequestBody GroupPointFormDTO formDTO) {
+		String userId = loginInfo.getUserId();
 		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.MyGroupRank.class);
-		String userId = formDTO.getUserId();
 		String gridId = formDTO.getGridId();
 		List<GroupPointRankingResultDTO> list = bizPointTotalDetailService.listMyGroupPointRanding(userId, gridId);
 		return new Result<List<GroupPointRankingResultDTO>>().ok(list);