Merge pull request #122 from cheng521521/main

fix:解决添加招聘需要hiring,sharing权限问题
Dapp-Learning-DAO · Jan 15, 2024 · 66abd85 · 66abd85
2 parents 5f19e36 + 92a11b9
commit 66abd85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/main/java/com/dl/officialsite/hiring/HireController.java b/src/main/java/com/dl/officialsite/hiring/HireController.java
@@ -2,7 +2,6 @@
 
 import com.dl.officialsite.common.base.BaseResponse;
 import com.dl.officialsite.hiring.vo.HiringVO;
-import com.dl.officialsite.login.Auth;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/main/java/com/dl/officialsite/hiring/HireService.java b/src/main/java/com/dl/officialsite/hiring/HireService.java
@@ -11,6 +11,9 @@
 import com.dl.officialsite.mail.EmailService;
 import com.dl.officialsite.member.Member;
 import com.dl.officialsite.member.MemberRepository;
+import com.dl.officialsite.member.MemberService;
+import com.dl.officialsite.member.MemberWithTeam;
+import com.dl.officialsite.team.Team;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -19,11 +22,6 @@
 import java.util.stream.Collectors;
 import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.persistence.criteria.Predicate;
-
-import com.dl.officialsite.member.MemberService;
-import com.dl.officialsite.member.MemberWithTeam;
-import com.dl.officialsite.team.Team;
-import com.dl.officialsite.team.vo.TeamsWithMembers;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +56,6 @@ public class HireService {
     @Autowired
     private EmailService emailService;
 
-
     @Autowired
     private MemberService memberService;
     /**
@@ -71,8 +68,8 @@ public HiringVO add(HiringVO hiringVO, String address) {
         //check in hiring team or in sharing team
 
         MemberWithTeam memberWithTeam =  memberService.getMemberWithTeamInfoByAddress(address);
-        ArrayList<TeamsWithMembers> teams = memberWithTeam.getTeams();
-        List teamNames = teams.stream().map(x->x.getTeamName()).collect(Collectors.toList());
+        ArrayList<Team> teams = memberWithTeam.getTeams();
+        List teamNames = teams.stream().map(Team::getTeamName).collect(Collectors.toList());
         if(!teamNames.contains("Dapp-Learning DAO co-founders") && !teamNames.contains("Dapp-Learning DAO sharing group") && !teamNames.contains("Hiring Team")) {
             throw new BizException("1001", "no permission");
         }

diff --git a/src/main/java/com/dl/officialsite/member/MemberWithTeam.java b/src/main/java/com/dl/officialsite/member/MemberWithTeam.java
@@ -2,17 +2,16 @@
 
 
 import com.dl.officialsite.team.Team;
-import com.dl.officialsite.team.vo.TeamsWithMembers;
-import lombok.*;
-
 import java.util.ArrayList;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class MemberWithTeam extends Member
 {
 
-    private ArrayList<TeamsWithMembers> teams;
+    private ArrayList<Team> teams;
 
     private boolean isAdmin;
 

diff --git a/src/main/java/com/dl/officialsite/team/TeamRepository.java b/src/main/java/com/dl/officialsite/team/TeamRepository.java
@@ -1,6 +1,5 @@
 package com.dl.officialsite.team;
 
-import com.dl.officialsite.member.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
@@ -14,6 +13,4 @@ public interface TeamRepository extends JpaRepository<Team, Long>, JpaSpecificat
 
 
 
-
-
 }