licailing 4 лет назад
Родитель
Сommit
ebc76a578c

+ 2 - 2
src/main/java/com/izouma/wenlvju/service/UserService.java

@@ -334,11 +334,11 @@ public class UserService {
     /**
      * 扫描作品二维码,通过手机号获取身份
      */
-    public Map<String, String> getAuth(Long id, String phone, String proPhone) {
+    public Map<String, String> getAuth(Long id, String phone, String proPhone, String instructorPhone) {
         Map<String, String> map = new HashMap<>();
 
         if (ObjectUtil.isNotNull(id)) {
-            if (phone.equals(proPhone)) {
+            if (phone.equals(proPhone) || phone.equals(instructorPhone)) {
                 map.put("phone", phone);
                 return map;
             }

+ 1 - 1
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -960,7 +960,7 @@ public class ProgrammeService {
      */
     public ProgrammeShowDTO get(Long id, String phone) {
         Programme apply = programmeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        userService.getAuth(id, phone, apply.getPhone());
+        userService.getAuth(id, phone, apply.getPhone(), apply.getInstructorPhone());
         ProgrammeShowDTO showDTO = this.toShowDTO(apply);
         awardRepo.findById(apply.getAwardId()).ifPresent(aw -> showDTO.setAward(aw.getName()));
         performanceRepo.findById(apply.getPerformanceId()).ifPresent(pe -> showDTO.setShowAward(pe.isShowAward()));

+ 1 - 1
src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -228,7 +228,7 @@ public class ProgrammeController extends BaseController {
     @PostMapping("/getAuth")
     public Map<String, String> getAuth(@RequestParam Long id, @RequestParam String phone) {
         Programme apply = programmeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        return userService.getAuth(id, phone, apply.getPhone());
+        return userService.getAuth(id, phone, apply.getPhone(), apply.getInstructorPhone());
     }
 
     @ApiOperation("查分数信息")

+ 6 - 0
src/main/vue/src/views/performance/ProgrammeList.vue

@@ -635,6 +635,9 @@ export default {
             if (this.form.name) {
                 data.query.name = this.form.name;
             }
+            if (this.form.id) {
+                data.query.id = this.form.id;
+            }
             if (this.form.programmeStatus) {
                 data.query.programmeStatus = this.form.programmeStatus;
             }
@@ -719,6 +722,9 @@ export default {
             if (this.form.name) {
                 data.query.name = this.form.name;
             }
+            if (this.form.id) {
+                data.query.id = this.form.id;
+            }
             if (this.form.programmeStatus) {
                 data.query.programmeStatus = this.form.programmeStatus;
             }