修改新增/编辑跨学校管理员时，学校显示数量只有10个的问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/dao/SchoolDao.java

@@ -1,10 +1,13 @@
 package cn.com.qmth.stmms.biz.school.dao;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import cn.com.qmth.stmms.biz.school.model.School;
 
-public interface SchoolDao extends PagingAndSortingRepository<School, Integer>,
-        JpaSpecificationExecutor<School> {
+public interface SchoolDao extends PagingAndSortingRepository<School, Integer>, JpaSpecificationExecutor<School> {
+
+    List<School> findByEnable(boolean enable);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/service/SchoolService.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.stmms.biz.school.service;
 
+import java.util.List;
+
 import cn.com.qmth.stmms.biz.school.model.School;
 import cn.com.qmth.stmms.biz.school.query.SchoolSearchQuery;
 
@@ -15,4 +17,6 @@ public interface SchoolService {
 
     void delete(School school);
 
+    List<School> findAll();
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/service/impl/SchoolServiceImpl.java

@@ -33,6 +33,11 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
         return schoolDao.findOne(id);
     }
 
+    @Override
+    public List<School> findAll() {
+        return schoolDao.findByEnable(true);
+    }
+
     public SchoolSearchQuery findByQuery(final SchoolSearchQuery query) {
         checkQuery(query);
         Page<School> result = schoolDao.findAll(new Specification<School>() {
@@ -49,8 +54,8 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
                 if (StringUtils.isNotBlank(query.getCity())) {
                     predicates.add(cb.equal(root.get("city"), query.getCity()));
                 }
-                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
-                        .size()]));
+                return predicates.isEmpty() ? cb.conjunction()
+                        : cb.and(predicates.toArray(new Predicate[predicates.size()]));
             }
 
         }, query);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolUserController.java

@@ -17,7 +17,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import cn.com.qmth.stmms.admin.exam.parameter.BaseParameterController;
 import cn.com.qmth.stmms.biz.school.model.School;
-import cn.com.qmth.stmms.biz.school.query.SchoolSearchQuery;
 import cn.com.qmth.stmms.biz.school.service.SchoolService;
 import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
@@ -28,7 +27,7 @@ import cn.com.qmth.stmms.common.utils.Md5EncryptUtils;
 
 @Controller
 @RequestMapping("/admin/sys/school/user")
-public class SchoolUserController extends BaseParameterController{
+public class SchoolUserController extends BaseParameterController {
 
     @Autowired
     private SchoolService schoolService;
@@ -37,7 +36,7 @@ public class SchoolUserController extends BaseParameterController{
     private UserService userService;
 
     @RequestMapping
-    public String list(Model model,HttpServletRequest request, UserSearchQuery query) {
+    public String list(Model model, HttpServletRequest request, UserSearchQuery query) {
         query.setType(UserType.ADMIN);
         query.addIncludeRole(Role.SCHOOL_ADMIN);
         query = userService.searchByQuery(query);
@@ -47,33 +46,33 @@ public class SchoolUserController extends BaseParameterController{
 
     @RequestMapping(value = "/add", method = RequestMethod.GET)
     public String add(Model model) {
-        SchoolSearchQuery query = new SchoolSearchQuery();
-        model.addAttribute("schools", schoolService.findByQuery(query));
-        model.addAttribute("user",new User());
+        model.addAttribute("schools", schoolService.findAll());
+        model.addAttribute("user", new User());
         return "modules/sys/schoolUserAdd";
     }
 
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public String adminSave(HttpServletRequest request, User user,Integer[] schoolIds,RedirectAttributes redirectAttributes) {
-    	Set<School> schools = new HashSet<>();
-    	if(schoolIds == null || schoolIds.length == 0){
-        	addMessage(redirectAttributes, "至少选择一个学校");
-        	return "redirect:/admin/sys/school/user/add";
-        }else{
-        	for (Integer id : schoolIds) {
-        		School school = schoolService.findById(id);
-        		schools.add(school);
-			}
+    public String adminSave(HttpServletRequest request, User user, Integer[] schoolIds,
+            RedirectAttributes redirectAttributes) {
+        Set<School> schools = new HashSet<>();
+        if (schoolIds == null || schoolIds.length == 0) {
+            addMessage(redirectAttributes, "至少选择一个学校");
+            return "redirect:/admin/sys/school/user/add";
+        } else {
+            for (Integer id : schoolIds) {
+                School school = schoolService.findById(id);
+                schools.add(school);
+            }
         }
         if (user.getId() != null) {
-        	User previous = userService.findById(user.getId());
-        	previous.setName(user.getName());
+            User previous = userService.findById(user.getId());
+            previous.setName(user.getName());
             previous.setSchoolId(schoolIds[0]);
             previous.setSchools(schools);
             userService.save(previous);
             return "redirect:/admin/sys/school/user";
         } else if (StringUtils.isBlank(user.getPassword())) {
-        	addMessage(redirectAttributes, "密码不能为空");
+            addMessage(redirectAttributes, "密码不能为空");
         } else if (checkLoginName(user)) {
             user.setStatus(1);
             user.setType(UserType.ADMIN);
@@ -88,19 +87,18 @@ public class SchoolUserController extends BaseParameterController{
         addMessage(redirectAttributes, "登录名重复");
         return "redirect:/admin/sys/school/user/add";
     }
-    
+
     @RequestMapping(value = "/edit", method = RequestMethod.GET)
     public ModelAndView editInit(HttpServletRequest request, @RequestParam Integer id) {
         User user = userService.findById(id);
         if (user != null) {
-            SchoolSearchQuery query = new SchoolSearchQuery();
             ModelAndView view = new ModelAndView("modules/sys/schoolUserEdit");
-            view.addObject("schools", schoolService.findByQuery(query));
-            if(user.getSchools().isEmpty()){
-            	Set<School> schools = new HashSet<>();
-            	schools.add(schoolService.findById(user.getSchoolId()));
-            	user.setSchools(schools);
-            	userService.save(user);
+            view.addObject("schools", schoolService.findAll());
+            if (user.getSchools().isEmpty()) {
+                Set<School> schools = new HashSet<>();
+                schools.add(schoolService.findById(user.getSchoolId()));
+                user.setSchools(schools);
+                userService.save(user);
             }
             view.addObject("user", user);
             return view;
@@ -108,7 +106,7 @@ public class SchoolUserController extends BaseParameterController{
             return new ModelAndView("redirect:/admin/sys/school/user");
         }
     }
-    
+
     private boolean checkLoginName(User user) {
         User previous = userService.findByLoginName(user.getLoginName());
         if (previous == null || (user.getId() != null && previous.getId().equals(user.getId()))) {
@@ -117,5 +115,5 @@ public class SchoolUserController extends BaseParameterController{
             return false;
         }
     }
-    
+
 }