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

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

@@ -82,6 +82,9 @@ public class SysUser extends BaseEntity
     /** 站点组组 */
     private int[] siteId;
 
+    /** 创建用户 */
+    private String createByOne;
+
     public SysUser()
     {
 
@@ -310,6 +313,17 @@ public class SysUser extends BaseEntity
         this.siteId = siteId;
     }
 
+    public void setCreateByOne(String createByOne)
+    {
+        this.createByOne = createByOne;
+    }
+
+    public String getCreateByOne()
+    {
+        return createByOne;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

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

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

@@ -59,6 +59,12 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @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);
+        }
         return userMapper.selectUserList(user);
     }