Merge remote-tracking branch 'origin/school_control' into school_control

ljq
2 parents 60c2aff5 ed9ec1c2
Showing 5 changed files with 10 additions and 7 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/pages/subjectUser/subjectUserList.html
@@ -304,7 +304,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     }
     @RequestMapping(value = "/userNameList")
-    public List<String> userNameList() {
+    public List<Map<String,String>> userNameList() {
         return sysUserService.userNameList();
     }
@@ -172,7 +172,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
                     result.put("userId",su.get("userId"));
                     result.put("rq",su.get("rq"));
                     result.put("name",su.get("name"));
-                    result.put("userName",su.get("name"));
+                    result.put("userName",su.get("userName"));
                     result.put("sum",sum);
                     result.put("t",t);
                     result.put("f",f);
@@ -21,5 +21,5 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	Map<String, Object> resetPassword(@RequestParam Integer id);
-	List<String> userNameList();
+	List<Map<String,String>> userNameList();
 }
@@ -182,11 +182,14 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	}
 	@Override
-	public List<String> userNameList(){
-		List<String> users=new ArrayList<>();
+	public List<Map<String,String>> userNameList(){
+		List<Map<String,String>> users=new ArrayList<>();
 		List<SysUser> userList=sysUserRepository.findByParentID(String.valueOf(SecurityUtils.getCurrentUser().getId()));;//根据教师id查询所属学生id
 		for (SysUser user : userList) {
-			users.add(String.valueOf(user.getUserName()));
+			Map<String,String> map=new HashMap<>();
+			map.put("userName",String.valueOf(user.getUserName()));
+			map.put("name",user.getUserName()+"-"+user.getName());
+			users.add(map);
 		}
 		return users;
 	}
@@ -93,7 +93,7 @@
 			var data=[];
 			data.push({id: "", text:"请选择"});
 			for(var code in result){
-				data.push({id: result[code], text: result[code]});
+				data.push({id: result[code].userName, text: result[code].userName});
 			}
 			initPinYinSelect2('#userName',data,'');
 		})