baibx 3 miesięcy temu
rodzic
commit
f58c5f36d5

+ 3 - 1
com.sharemao.web.manager/src/main/java/com/sharemao/manager/ctrl/LoginCtrl.java

@@ -36,7 +36,9 @@ public class LoginCtrl
36
 		//String verifyCode=para.get("verifyCode");
36
 		//String verifyCode=para.get("verifyCode");
37
 		String pwd=para.get("password");
37
 		String pwd=para.get("password");
38
 		String lang=para.get("language");
38
 		String lang=para.get("language");
39
-		LanguageUtil.init(lang);
39
+        if (!Tools.isEmpty(lang)){
40
+            LanguageUtil.init(lang);
41
+        }
40
 		if(session.isNew())
42
 		if(session.isNew())
41
 			return new TextView("/index.jsp");
43
 			return new TextView("/index.jsp");
42
 		if(Tools.isEmpty(username) || Tools.isEmpty(pwd)) {
44
 		if(Tools.isEmpty(username) || Tools.isEmpty(pwd)) {

+ 1 - 1
com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/PrivilegeServiceImpl.java

@@ -17,7 +17,7 @@ public class PrivilegeServiceImpl implements PrivilegeService {
17
 		String sql = "SELECT a.id,a.roleid,a.moduleid,a.crud FROM privilege a, module c "
17
 		String sql = "SELECT a.id,a.roleid,a.moduleid,a.crud FROM privilege a, module c "
18
 				+ " WHERE a.roleid="+roleid+" AND a.moduleid=c.id AND c.path='"+path+"'";
18
 				+ " WHERE a.roleid="+roleid+" AND a.moduleid=c.id AND c.path='"+path+"'";
19
 		List<Map<String, Object>> list= baseDao.getMapList(sql);
19
 		List<Map<String, Object>> list= baseDao.getMapList(sql);
20
-		if(list.size()>0){
20
+		if(list!=null&&list.size()>0){
21
 			Map<String, Object> pamp = list.get(0);
21
 			Map<String, Object> pamp = list.get(0);
22
 			return new Privilege(Integer.parseInt(String.valueOf(pamp.get("id"))),Integer.parseInt(String.valueOf(pamp.get("roleid"))),
22
 			return new Privilege(Integer.parseInt(String.valueOf(pamp.get("id"))),Integer.parseInt(String.valueOf(pamp.get("roleid"))),
23
 					Integer.parseInt(String.valueOf(pamp.get("moduleid"))),String.valueOf(pamp.get("crud")));
23
 					Integer.parseInt(String.valueOf(pamp.get("moduleid"))),String.valueOf(pamp.get("crud")));