更改电压上下限和功率因数上限更新8

fiveep-model/src/main/java/com/bizmatics/model/system/SysRole.java

@@ -51,6 +51,8 @@ public class SysRole extends BaseEntity
 
     /** 部门组（数据权限） */
     private Long[] deptIds;
+    /** 创建用户 */
+    private String createByOne;
 
     public SysRole()
     {
@@ -196,6 +198,16 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
+
+    public void setCreateByOne(String createByOne)
+    {
+        this.createByOne = createByOne;
+    }
+
+    public String getCreateByOne()
+    {
+        return createByOne;
+    }
     
     @Override
     public String toString() {

fiveep-persistence/src/main/resources/mapper/mysql/system/SysRoleMapper.xml

@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="roleName != null and roleName != ''">
 			AND r.role_name like concat('%', #{roleName}, '%')
 		</if>
+		<if test="createByOne != null and createByOne != ''">
+			AND r.create_by = #{createByOne}
+		</if>
 		<if test="status != null and status != ''">
 			AND r.status = #{status}
 		</if>

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysRoleServiceImpl.java

@@ -13,6 +13,7 @@ import com.bizmatics.persistence.mapper.system.SysRoleMenuMapper;
 import com.bizmatics.persistence.mapper.system.SysUserRoleMapper;
 import com.bizmatics.service.aop.DataScope;
 import com.bizmatics.service.system.ISysRoleService;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,8 @@ public class SysRoleServiceImpl implements ISysRoleService
     @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
+        String createByOne = SecurityUtils.getLoginUser().getUser().getUserName();
+        role.setCreateByOne(createByOne);
         return roleMapper.selectRoleList(role);
     }
 

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysUserServiceImpl.java

@@ -60,11 +60,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
         String createBy = SecurityUtils.getLoginUser().getUser().getUserName();
-        if (createBy.equals("admin")){
-            user.setCreateByOne(null);
-        }else {
-            user.setCreateByOne(createBy);
-        }
+        user.setCreateByOne(createBy);
         return userMapper.selectUserList(user);
     }