java/DolphinEnglish.git

			@@ -98,8 +98,8 @@
			public R update(@RequestBody SubjectDTO dto) {
			TSubject tSubject = new TSubject();
			// 判断当前题目有没有被使用
			R<Object> week = getObjectR(dto.getId());
			if (week != null) return week;
			// R<Object> week = getObjectR(dto.getId());
			// if (week != null) return week;
			BeanUtils.copyProperties(dto,tSubject);
			subjectService.updateById(tSubject);
			return R.ok("编辑成功");
			@@ -118,7 +118,7 @@
			if (s.equals(String.valueOf(id))) {
			Integer week = tStudyListen.getWeek();
			Integer day = tStudyListen.getDay();
			return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "听音选图中使用");
			return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "听音选图中使用");
			}
			}
			}
			@@ -130,7 +130,7 @@
			if (s.equals(String.valueOf(id))) {
			Integer week = tStudyListen.getWeek();
			Integer day = tStudyListen.getDay();
			return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "看图选音中使用");
			return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "看图选音中使用");
			}
			}
			}
			@@ -142,7 +142,7 @@
			if (s.equals(String.valueOf(id))) {
			Integer week = tStudyListen.getWeek();
			Integer day = tStudyListen.getDay();
			return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "归纳排除中使用");
			return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "归纳排除中使用");
			}
			}
			}
			@@ -154,7 +154,7 @@
			if (subject.equals(id) \|\| answerSubject.equals(id)) {
			Integer week = tStudyListen.getWeek();
			Integer day = tStudyListen.getDay();
			return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "有问有答中使用");
			return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "有问有答中使用");
			}
			}
			}
			@@ -165,7 +165,7 @@
			if (s.equals(String.valueOf(id))) {
			Integer week = tStudyListen.getWeek();
			Integer day = tStudyListen.getDay();
			return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "音图相配中使用");
			return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "音图相配中使用");
			}
			}
			}