修改bug

mhotel/src/com/happy/action/adminAction.java

@@ -169,12 +169,12 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            if (admin.getAdminName()==null || admin.getUserName()==null || admin.getLevel()==null || admin.getPhone()==null){
-                resultJson.put("message", "各参数不能为空");
-                resultJson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-                return null;
-            }
+//            if (admin.getAdminName()==null || admin.getUserName()==null || admin.getLevel()==null || admin.getPhone()==null){
+//                resultJson.put("message", "各参数不能为空");
+//                resultJson.put("code", 500);
+//                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+//                return null;
+//            }
             if (admin.getPassword()!=null && !"".equals(admin.getPassword()) && !PwdDefind.vertify(admin.getPassword())){
                 resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
                 resultJson.put("code", 500);
@@ -251,7 +251,7 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         }
         Admin admin = adminService.getById(id);
         if (admin != null && !"".equals(admin)) {
-            admin.setPassword("Jams123456");
+            admin.setPassword("Jams_123456");
             int m = adminService.updateAdmin(admin);
             if(m > 0){
                 resultJson.put("message", "重置成功");

mhotel/src/com/happy/action/adminManagerAction.java

@@ -370,14 +370,13 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            if (admin.getAdminName()==null || admin.getCorpnName()==null || admin.getCorpnPhone()==null
-                    || admin.getLevel()==null || admin.getPassword()==null){
-                resultJson.put("message", "各参数不能为空");
+            if (admin.getId()==null){
+                resultJson.put("message", "用户主键不能为空");
                 resultJson.put("code", 500);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            if (!PwdDefind.vertify(admin.getPassword())){
+            if (admin.getPassword()!=null && !"".equals(admin.getPassword()) && !PwdDefind.vertify(admin.getPassword())){
                 resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
                 resultJson.put("code", 500);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -453,7 +452,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         }
         AdminManager admin = adminManagerService.getById(id);
         if (admin != null && !"".equals(admin)) {
-            admin.setPassword("Jams123456");
+            admin.setPassword("Jams_123456");
             int m = adminManagerService.updateAdmin(admin);
             if(m > 0){
                 resultJson.put("message", "重置成功");

mhotel/src/com/happy/action/hotelAction.java

@@ -365,7 +365,7 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             List<HotelDict> list1 = hotelDictService.queryList(s1.toString());
             resultJson.put("message", "查询成功");
             resultJson.put("code", 200);
-            resultJson.put("data"+code, list1);
+            resultJson.put("data", list1);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }

mhotel/src/com/happy/action/uploadAction.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
+import java.util.List;
 
 public class uploadAction extends ActionSupport implements ServletRequestAware {
 
@@ -24,6 +25,8 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
     public String url_name;
     public String url;
 
+    private List<File> fileList;
+
     public HttpServletRequest getRequest() {
         return request;
     }
@@ -88,7 +91,7 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
             return null;
         }
         try{
-            if (!myFileFileName.endsWith("jpg") && !myFileFileName.endsWith("png")){
+            if (!filepath.endsWith("jpg") && !myFileFileName.endsWith("png")){
                 resultJson.put("code", 500);
                 resultJson.put("message", "请上传jpg或png格式文件！");
                 ResponseUtil.writeJson(ServletActionContext.getResponse(),