业务编写

src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -45,6 +46,9 @@ public class MemberController {
     @Autowired
     BigDecimalUtils bigDecimalUtils;
 
+    @Autowired
+    private HttpServletRequest request;
+
     @AnonymousAccess
     @PostMapping("getMemberById")
     public ResultEntity getMember(@RequestBody String memberId) {
@@ -82,7 +86,8 @@ public class MemberController {
                                                              @ApiParam("分页索引：{0}为第一页") @RequestParam(required = false) Integer index,
                                                              @ApiParam("页量") @RequestParam(required = false) Integer size) {
 
-        PageInfo<MemberVO> pageInfo = memberService.pagedListMembers(className, trainingName, markStatus, keyword, index, size);
+        JwtUser jwtUser = TokenProvider.getJWTUser(request);
+        PageInfo<MemberVO> pageInfo = memberService.pagedListMembers(className, trainingName, markStatus, keyword, jwtUser.getSchoolId(),index, size);
         if (!pageInfo.getList().isEmpty()) {
             for (MemberVO vo : pageInfo.getList()) {
                 Training training = trainingService.findById(vo.getTrainingId());

src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java

@@ -65,7 +65,7 @@ public class TrainingController {
         training.setPeopleCount(members.size());
         GradeWeight gradeWeight = gradeWeightService.findBySchoolId(currentUser.getSchoolId()) == null
                 ? gradeWeightService.createDefaultWeight(currentUser)
-                : new GradeWeight();
+                : gradeWeightService.findBySchoolId(currentUser.getSchoolId());
         training.setWeightId(gradeWeight.getWeightId());
         trainingService.update(training);
 

src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java

@@ -78,6 +78,7 @@ public class MemberService {
                                                String trainingName,
                                                Integer markStatus,
                                                String keyword,
+                                               Integer schoolId,
                                                Integer page,
                                                Integer size) {
         MemberExample example = new MemberExample();
@@ -97,6 +98,7 @@ public class MemberService {
             orCriteria.andStudentNumberEqualTo("%" + keyword + "%");
             example.or(orCriteria);
         }
+        criteria.andSchoolIdEqualTo(schoolId);
         PageHelper.startPage(page, size);
         return new PageInfo<>(memberMapper.pagedListMembers(example));
     }