github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

部门非空条件判断

pull/15/head
RuoYi 2018-07-15 10:31:01 +08:00
parent 2f6e6736ca
commit 116f3ac6fc
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
View File

@ -6,9 +6,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.system.user.domain.User;
/**
* Bean 工具类
*
@ -122,20 +119,4 @@ public class BeanUtils
{
return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
}
public static void main(String[] args)
{
User user = new User();
User zhen = new User();
zhen.setUserName("测试名称");
Dept dept = new Dept();
dept.setDeptId(11L);
dept.setDeptName("测试部门");
zhen.setDept(dept);
BeanUtils.copyBeanProp(user, zhen);
System.out.println(user.getDept().getDeptName());
}
}

4
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@ -98,8 +98,12 @@ public class LogAspect
if (currentUser != null)
{
operLog.setOperName(currentUser.getLoginName());
if (StringUtils.isNotNull(currentUser.getDept())
&& StringUtils.isEmpty(currentUser.getDept().getDeptName()))
{
operLog.setDeptName(currentUser.getDept().getDeptName());
}
}
if (e != null)
{