ting.yin 6 anni fa
parent
commit
b909e8f18b

+ 15 - 8
stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolController.java

@@ -1,5 +1,8 @@
 package cn.com.qmth.stmms.admin.school;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONObject;
@@ -13,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+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;
@@ -27,7 +32,7 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller
 @RequestMapping("/admin/sys/school")
-public class SchoolController {
+public class SchoolController extends BaseParameterController{
 
     @Autowired
     private SchoolService schoolService;
@@ -235,27 +240,29 @@ public class SchoolController {
             return view;
     }
     @RequestMapping(value = "/adminList/save", method = RequestMethod.POST)
-    public ModelAndView adminListSave(HttpServletRequest request, User user) {
+    public 	String adminListSave(HttpServletRequest request, User user,RedirectAttributes redirectAttributes) {
         School school = schoolService.findById(user.getSchoolId());
         UserSearchQuery query = new UserSearchQuery();
         query.setSchoolId(user.getSchoolId());
         if (school == null) {
-            return new ModelAndView("redirect:/admin/sys/school");
+            return "redirect:/admin/sys/school";
         }
-        User previous = null;
-        String message = "";
          if (StringUtils.isBlank(user.getPassword())) {
-            message = "密码不能为空";
+        	 addMessage(redirectAttributes, "密码不能为空");
         } else if (checkLoginName(user)) {
             user.setStatus(1);
             user.setType(UserType.ADMIN);
             user.setRoleNames(Role.SCHOOL_ADMIN.getName());
             user.setPassword(Md5EncryptUtils.md5(user.getPassword()));
             userService.save(user);
+            Set<School> schools = new HashSet<>();
+            schools.add(school);
+            user.setSchools(schools);
+            userService.save(user);
         } else {
-            message = "登录名重复";
+        	addMessage(redirectAttributes, "登录名重复");
         }
-        return adminList(request,query,message);
+        return "redirect:/admin/sys/school/admin/view/"+user.getSchoolId();
     }
     @RequestMapping(value = "/adminList/reSetPW", method = RequestMethod.POST)
     @ResponseBody