From 319d15ae63453d528ab53f947265c7f864b7acb5 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Tue, 14 Aug 2018 17:46:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/member/model/MemberEntity.java       | 10 ----------
 .../member/service/impl/MemberService.java       |  2 --
 .../modules/tiku/service/ISubjectService.java    |  4 ++++
 .../tiku/service/impl/SubjectServiceImpl.java    | 16 ++++++++++++++++
 .../com/tamguo/web/tiku/SubjectController.java   |  8 ++++++++
 .../main/resources/static/js/member/account.js   |  2 +-
 .../main/resources/static/js/member/register.js  |  3 +--
 .../src/main/resources/templates/register.html   |  2 +-
 8 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java
index ef7ee1b..2639501 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/model/MemberEntity.java
@@ -16,8 +16,6 @@ public class MemberEntity extends SuperEntity<MemberEntity> implements Serializa
 	private static final long serialVersionUID = 1L;
 	
 	private String subjectId;
-	
-	private String courseId;
 
 	private String username;
 	
@@ -171,14 +169,6 @@ public class MemberEntity extends SuperEntity<MemberEntity> implements Serializa
 		this.subjectId = subjectId;
 	}
 
-	public String getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(String courseId) {
-		this.courseId = courseId;
-	}
-
 	public String getNowPassword() {
 		return nowPassword;
 	}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/service/impl/MemberService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/service/impl/MemberService.java
index 8be4eed..e54bd04 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/member/service/impl/MemberService.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/member/service/impl/MemberService.java
@@ -109,7 +109,6 @@ public class MemberService extends ServiceImpl<MemberMapper, MemberEntity> imple
 		entity.setUsername(member.getUsername());
 		entity.setNickName(member.getUsername());
 		entity.setSubjectId(member.getSubjectId());
-		entity.setCourseId(member.getCourseId());
 		entity.setEmail(member.getEmail());
 		memberMapper.insert(entity);
 		return Result.result(200, entity, "注册成功");
@@ -190,7 +189,6 @@ public class MemberService extends ServiceImpl<MemberMapper, MemberEntity> imple
 		entity.setAvatar(member.getAvatar());
 		entity.setEmail(member.getEmail());
 		entity.setMobile(member.getMobile());
-		entity.setCourseId(member.getCourseId());
 		entity.setSubjectId(member.getSubjectId());
 		entity.setNickName(member.getNickName());
 		
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java
index 1a299b0..0e81015 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java
@@ -25,6 +25,10 @@ public interface ISubjectService extends IService<SubjectEntity>{
 	/** 删除分类*/
 	void delete(String uid);
 
+	/** 科目树*/
 	JSONArray getCourseCascaderTree();
 
+	/** 分类树*/
+	JSONArray getSubjectTree();
+
 }
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectServiceImpl.java
index 9de7b7e..df19e70 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectServiceImpl.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectServiceImpl.java
@@ -115,4 +115,20 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, SubjectEntity
 		return courseTree;
 	}
 
+	@Transactional(readOnly=true)
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONArray getSubjectTree() {
+		JSONArray courseTree = new JSONArray();
+		List<SubjectEntity> subjectList = subjectMapper.selectList(Condition.EMPTY);
+		for(int i=0 ; i<subjectList.size() ; i++){
+			SubjectEntity subject = subjectList.get(i);
+			JSONObject node = new JSONObject();
+			node.put("value", subject.getId());
+			node.put("label", subject.getName());
+			courseTree.add(node);
+		}
+		return courseTree;
+	}
+
 }
diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java
index 72defd8..91c7213 100644
--- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java
+++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java
@@ -92,4 +92,12 @@ public class SubjectController {
 		JSONArray list = iSubjectService.getCourseCascaderTree();
 		return Result.successResult(list);
 	}
+	
+	// [{"value":"11","label":"北京市"}]
+	@RequestMapping(value = {"subject/getSubjectTree.html"}, method = RequestMethod.GET)
+	@ResponseBody
+	public Result getSubjectTree() {
+		JSONArray list = iSubjectService.getSubjectTree();
+		return Result.successResult(list);
+	}
 }
diff --git a/tamguo-tms/src/main/resources/static/js/member/account.js b/tamguo-tms/src/main/resources/static/js/member/account.js
index c966c9b..3aa141f 100644
--- a/tamguo-tms/src/main/resources/static/js/member/account.js
+++ b/tamguo-tms/src/main/resources/static/js/member/account.js
@@ -62,7 +62,7 @@ var vm = new Vue({
 		          });
 		      },
 		      getCourses:function(){
-		    	  axios.get(mainHttp + 'subject/getCourseCascaderTree.html').then(function(response){
+		    	  axios.get(mainHttp + 'subject/getSubjectTree.html').then(function(response){
 		    		  vm.courses = response.data.result;
 		    	  });  
 		      },
diff --git a/tamguo-tms/src/main/resources/static/js/member/register.js b/tamguo-tms/src/main/resources/static/js/member/register.js
index aa3bd8b..a51618b 100644
--- a/tamguo-tms/src/main/resources/static/js/member/register.js
+++ b/tamguo-tms/src/main/resources/static/js/member/register.js
@@ -78,7 +78,6 @@ var vm = new Vue({
          this.$refs[formName].validate((valid) => {
 	          if (valid) {
 	        	vm.loading = true;
-	        	vm.member.courseId = vm.member.kemuId[1];
 	    		vm.member.subjectId = vm.member.kemuId[0];
 	            axios({method: 'post',url: mainHttp + 'subRegister.html',data: vm.member}).then(function(response){
 	      		    if(response.data.code == 200){
@@ -102,7 +101,7 @@ var vm = new Vue({
         this.$refs[formName].resetFields();
       },
       getCourses:function(){
-    	  axios.get(mainHttp + 'subject/getCourseCascaderTree.html').then(function(response){
+    	  axios.get(mainHttp + 'subject/getSubjectTree.html').then(function(response){
     		  vm.courses = response.data.result;
     	  });  
       },
diff --git a/tamguo-tms/src/main/resources/templates/register.html b/tamguo-tms/src/main/resources/templates/register.html
index ea74f40..1fe0efc 100644
--- a/tamguo-tms/src/main/resources/templates/register.html
+++ b/tamguo-tms/src/main/resources/templates/register.html
@@ -34,7 +34,7 @@
 						  <el-form-item label="用戶名" prop="username">
 						    <el-input v-model="member.username"></el-input>
 						  </el-form-item>
-						  <el-form-item label="科目" prop="kemuId">
+						  <el-form-item label="类型" prop="kemuId">
 						    <el-cascader
 							    :options="courses"
 							    v-model="member.kemuId">