From 203161867da4d5c6d2171085e6ea4a0d3edb4425 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 15 Mar 2020 12:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=A3=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/reflect/ReflectUtils.java | 12 +++++++++--- .../java/com/jeesite/modules/config/ShiroConfig.java | 4 +++- .../java/com/jeesite/modules/sys/entity/EmpUser.java | 6 +++--- .../views/modules/sys/user/empUserIndex.html | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java index eba64bc2..80183f66 100644 --- a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java +++ b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java @@ -97,7 +97,9 @@ public class ReflectUtils { Field field = getAccessibleField(obj, fieldName); if (field == null) { //throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + if (obj != null) { + logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + } return null; } E result = null; @@ -141,7 +143,9 @@ public class ReflectUtils { Method method = getAccessibleMethod(obj, methodName, parameterTypes); if (method == null) { //throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); - logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 "); + if (obj != null) { + logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 "); + } return null; } try { @@ -164,7 +168,9 @@ public class ReflectUtils { if (method == null) { // 如果为空不报错，直接返回空。 // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); - logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 "); + if (obj != null) { + logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 "); + } return null; } try { diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index 6fbac14a..606b40cc 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -50,12 +50,14 @@ public class ShiroConfig { /** * Apache Shiro Filter - * @throws Exception */ @Bean @Order(3000) @ConditionalOnMissingBean(name="shiroFilterProxy") public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { + if (Global.isUseCorpModel() != Global.getPropertyToBoolean("user.useCorpModel", "false")){ + throw new Exception("\n\nuser.useCorpModel=true? 你是否开启了多租户模式？视乎你的当前版本不是JeeSite专业版。\n"); + } FilterRegistrationBean bean = new FilterRegistrationBean<>(); bean.setFilter((Filter) shiroFilter.getInstance()); bean.addUrlPatterns("/*"); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index beda0091..767e7372 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -97,12 +97,12 @@ public class EmpUser extends User { @ExcelField(title="电子邮箱", attrName="email", align=Align.LEFT, sort=50), @ExcelField(title="手机号码", attrName="mobile", align=Align.CENTER, sort=60), @ExcelField(title="办公电话", attrName="phone", align=Align.CENTER, sort=70), - @ExcelField(title="性别", attrName="sex", dictType="sys_user_sex", words=10, align=Align.CENTER, sort=75), + @ExcelField(title="性别", attrName="sex", dictType="sys_user_sex", align=Align.CENTER, words=10, sort=75), @ExcelField(title="员工编码", attrName="employee.empCode", align=Align.CENTER, sort=80), @ExcelField(title="员工姓名", attrName="employee.empName", align=Align.CENTER, sort=95), @ExcelField(title="拥有角色编号", attrName="userRoleString", align=Align.LEFT, sort=800, type=ExcelField.Type.IMPORT), - @ExcelField(title="建档日期", attrName="createDate", words=15, align=Align.CENTER, sort=900, type=ExcelField.Type.EXPORT, dataFormat="yyyy-MM-dd"), - @ExcelField(title="最后登录", attrName="lastLoginDate", words=20, align=Align.CENTER, sort=900, type=ExcelField.Type.EXPORT), + @ExcelField(title="建档日期", attrName="createDate", align=Align.CENTER, words=15, sort=900, type=ExcelField.Type.EXPORT, dataFormat="yyyy-MM-dd"), + @ExcelField(title="最后登录", attrName="lastLoginDate", align=Align.CENTER, words=20, sort=900, type=ExcelField.Type.EXPORT), }) public Employee getEmployee(){ Employee employee = (Employee)super.getRefObj(); diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index 504ea390..d83d2b40 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -41,7 +41,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ //win.$('button[type=reset]').click(); win.$('#officeCode').val(treeNode.id); win.$('#officeName').val(treeNode.name); - win.page(); + win.page(1); }} }, tree, loadTree = function(){ js.ajaxSubmit("${ctx}/sys/office/treeData?___t=" + new Date().getTime(), @@ -73,7 +73,7 @@ $('#btnCollapse').click(function(){ $('#btnRefresh').click(function(){ loadTree(); }); -//调用子页分页函数 +// 调用子页分页函数 function page(){ win.page(); }