diff --git a/common/src/main/java/com/jeesite/common/network/IpUtils.java b/common/src/main/java/com/jeesite/common/network/IpUtils.java index 969f17ee..d2c9dd8b 100644 --- a/common/src/main/java/com/jeesite/common/network/IpUtils.java +++ b/common/src/main/java/com/jeesite/common/network/IpUtils.java @@ -93,7 +93,7 @@ public class IpUtils { } public static byte[] textToNumericFormatV4(String paramString) { - if (paramString.length() == 0) { + if (paramString.isEmpty()) { return null; } byte[] arrayOfByte = new byte[4]; diff --git a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java index b1c86297..a44b0ab1 100644 --- a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java +++ b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java @@ -1,5 +1,7 @@ package com.jeesite.common.utils; +import org.apache.commons.lang3.StringUtils; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -7,8 +9,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang3.StringUtils; - /** * 身份证工具类 * @@ -152,7 +152,7 @@ public class IdcardUtils extends StringUtils { int iSum17 = getPowerSum(iCard); // 获取校验位 String sVal = getCheckCode18(iSum17); - if (sVal.length() > 0) { + if (!sVal.isEmpty()) { idCard18 += sVal; } else { return null; @@ -205,7 +205,7 @@ public class IdcardUtils extends StringUtils { int iSum17 = getPowerSum(iCard); // 获取校验位 String val = getCheckCode18(iSum17); - if (val.length() > 0) { + if (!val.isEmpty()) { if (val.equalsIgnoreCase(code18)) { bTrue = true; } diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index fb08c214..79391ea9 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -362,8 +362,10 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica data.put("isValidCodeLogin", Global.getConfigToInteger("sys.login.failedNumAfterValidCode", "200") == 0); //获取当前会话对象 - Session session = UserUtils.getSession(); - data.put("sessionid", (String)session.getId()); + if (ServletUtils.isAjaxRequest(request)) { + Session session = UserUtils.getSession(); + data.put("sessionid", (String)session.getId()); + } // 如果登录设置了语言,则切换语言 if (paramMap.get("lang") != null){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 667186a6..91aa2742 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -240,7 +240,7 @@ public class Log extends DataEntity { /** * 设置请求参数 - * @param paramMap + * @param paramsMap */ @SuppressWarnings({ "unchecked", "rawtypes" }) public void setRequestParams(Map paramsMap){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index b88fa3ae..d895c964 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -80,6 +80,14 @@ public class EmpUserServiceSupport extends CrudService } } + /** + * 查询数据 + */ + @Override + public List findList(EmpUser entity) { + return super.findList(entity); + } + /** * 分页查询数据 */ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java index a53ed430..8cc3d120 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmployeeServiceSupport.java @@ -49,7 +49,15 @@ public class EmployeeServiceSupport extends CrudService where.setEmpNo(employee.getEmpNo()); return dao.getByEntity(where); } - + + /** + * 查询数据 + */ + @Override + public List findList(Employee entity) { + return super.findList(entity); + } + /** * 查询分页数据 */ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java index d6eb10d5..a9f19f77 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java @@ -50,6 +50,14 @@ public class PostServiceSupport extends CrudService return dao.getByEntity(where); } + /** + * 查询数据 + */ + @Override + public List findList(Post entity) { + return super.findList(entity); + } + /** * 查询岗位 */