diff --git a/hxhq-common/hxhq-common-security/src/main/java/com/hxhq/common/security/config/BaseMetaObjectHandler.java b/hxhq-common/hxhq-common-security/src/main/java/com/hxhq/common/security/config/BaseMetaObjectHandler.java
index 51e7414..5556924 100644
--- a/hxhq-common/hxhq-common-security/src/main/java/com/hxhq/common/security/config/BaseMetaObjectHandler.java
+++ b/hxhq-common/hxhq-common-security/src/main/java/com/hxhq/common/security/config/BaseMetaObjectHandler.java
@@ -40,7 +40,7 @@ public class BaseMetaObjectHandler implements MetaObjectHandler {
 	public void insertFill(MetaObject metaObject) {
 		// 创建用户
 		Object createBy = getFieldValByName(CREATE_BY, metaObject);
-		if (createBy == null || createBy.equals("")) {
+		if (createBy == null || "".equals(createBy)) {
 			setFieldValByName(CREATE_BY, SecurityUtils.getLoginUserOfEmpty().getUserid()==null?"": SecurityUtils.getLoginUserOfEmpty().getUserid().toString(), metaObject);
 		}
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDeptServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDeptServiceImpl.java
index 241235a..08d04fb 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDeptServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDeptServiceImpl.java
@@ -40,10 +40,10 @@ public class SysDeptServiceImpl implements ISysDeptService
      * 查询部门管理数据
      * 
      * @param dept 部门信息
-     * @return 部门信息集合
+     * @return 部门信息集合//    @DataScope(deptAlias = "d")
      */
     @Override
-//    @DataScope(deptAlias = "d")
+
     public List<SysDept> selectDeptList(SysDept dept)
     {
         return deptMapper.selectDeptList(dept);
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysRoleServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysRoleServiceImpl.java
index a8850b0..d86601e 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysRoleServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysRoleServiceImpl.java
@@ -50,10 +50,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * 根据条件分页查询角色数据
      * 
      * @param role 角色信息
-     * @return 角色数据集合信息
+     * @return 角色数据集合信息//    @DataScope(deptAlias = "d")
      */
     @Override
-//    @DataScope(deptAlias = "d")
+
     public List<SysRole> selectRoleList(SysRole role)
     {
         return roleMapper.selectRoleList(role);
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
index 5539ca4..3d7240d 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java
@@ -72,10 +72,10 @@ public class SysUserServiceImpl implements ISysUserService
      * 根据条件分页查询用户列表
      * 
      * @param user 用户信息
-     * @return 用户信息集合信息
+     * @return 用户信息集合信息//    @DataScope(deptAlias = "d", userAlias = "u")
      */
     @Override
-//    @DataScope(deptAlias = "d", userAlias = "u")
+
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);
@@ -85,10 +85,10 @@ public class SysUserServiceImpl implements ISysUserService
      * 根据条件分页查询已分配用户角色列表
      * 
      * @param user 用户信息
-     * @return 用户信息集合信息
+     * @return 用户信息集合信息//    @DataScope(deptAlias = "d", userAlias = "u")
      */
     @Override
-//    @DataScope(deptAlias = "d", userAlias = "u")
+
     public List<SysUser> selectAllocatedList(SysUser user)
     {
         return userMapper.selectAllocatedList(user);
@@ -98,10 +98,10 @@ public class SysUserServiceImpl implements ISysUserService
      * 根据条件分页查询未分配用户角色列表
      * 
      * @param user 用户信息
-     * @return 用户信息集合信息
+     * @return 用户信息集合信息//    @DataScope(deptAlias = "d", userAlias = "u")
      */
     @Override
-//    @DataScope(deptAlias = "d", userAlias = "u")
+
     public List<SysUser> selectUnallocatedList(SysUser user)
     {
         return userMapper.selectUnallocatedList(user);