bug修改

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -3,6 +3,7 @@ package com.ozs.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -17,84 +18,130 @@ import com.ozs.common.xss.Xss;
  *
  * @author hx
  */
-public class SysUser extends BaseEntity
-{
+public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long id;
-  
-    /** 用户ID */
+
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户ID")
     private String userId;
-    
-    /** 部门ID */
+
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "登录名称")
     private String userName;
 
-    /** 用户昵称 */
+    /**
+     * 用户昵称
+     */
     @Excel(name = "用户名称")
     private String nickName;
 
-    /** 用户邮箱 */
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码")
     private String phoneNum;
 
-    /** 用户性别 */
-    @Excel(name = "用户性别", readConverterExp = "1男 2女 3未知")
+    /**
+     * 用户性别
+     */
+    @Excel(name = "用户性别")
     private Integer sex;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     private String avatar;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "1正常 2停用")
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @Excel(name = "帐号状态")
     private Integer status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private Integer delFlag;
 
-    /** 最后登录IP */
+    /**
+     * 最后登录IP
+     */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登录时间 */
+    /**
+     * 最后登录时间
+     */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 部门对象 */
+    /**
+     * 部门对象
+     */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
-    /** 角色对象 */
+    /**
+     * 角色对象
+     */
     private List<SysRole> roles;
 
-    /** 角色组 */
+    /**
+     * 角色组
+     */
     private Long[] roleIds;
 
-    /** 岗位组 */
+    /**
+     * 岗位组
+     */
     private Long[] postIds;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    public SysUser()
-    {
+    private Integer dataPermission;
+
+    public Integer getDataPermission() {
+        return dataPermission;
+    }
+
+    public void setDataPermission(Integer dataPermission) {
+        this.dataPermission = dataPermission;
+    }
+
+    public SysUser() {
 
     }
 
@@ -106,81 +153,67 @@ public class SysUser extends BaseEntity
         this.id = id;
     }
 
-    public SysUser(Long userId)
-    {
+    public SysUser(Long userId) {
         this.id = id;
     }
 
-    public String getUserId()
-    {
+    public String getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId)
-    {
+    public void setUserId(String userId) {
         this.userId = userId;
     }
 
-    public boolean isAdmin()
-    {
+    public boolean isAdmin() {
         return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long id)
-    {
+    public static boolean isAdmin(Long id) {
         return id != null && 1L == id;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
+    public String getNickName() {
         return nickName;
     }
 
-    public void setNickName(String nickName)
-    {
+    public void setNickName(String nickName) {
         this.nickName = nickName;
     }
 
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
+    public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email)
-    {
+    public void setEmail(String email) {
         this.email = email;
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhoneNum()
-    {
+    public String getPhoneNum() {
         return phoneNum;
     }
 
@@ -188,149 +221,126 @@ public class SysUser extends BaseEntity
         this.phoneNum = phoneNum;
     }
 
-    public Integer getSex()
-    {
+    public Integer getSex() {
         return sex;
     }
 
-    public void setSex(Integer sex)
-    {
+    public void setSex(Integer sex) {
         this.sex = sex;
     }
 
-    public String getAvatar()
-    {
+    public String getAvatar() {
         return avatar;
     }
 
-    public void setAvatar(String avatar)
-    {
+    public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
 
-    public String getPassword()
-    {
+    public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password)
-    {
+    public void setPassword(String password) {
         this.password = password;
     }
 
-    public Integer getStatus()
-    {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(Integer status)
-    {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public Integer getDelFlag()
-    {
+    public Integer getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Integer delFlag)
-    {
+    public void setDelFlag(Integer delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getLoginIp()
-    {
+    public String getLoginIp() {
         return loginIp;
     }
 
-    public void setLoginIp(String loginIp)
-    {
+    public void setLoginIp(String loginIp) {
         this.loginIp = loginIp;
     }
 
-    public Date getLoginDate()
-    {
+    public Date getLoginDate() {
         return loginDate;
     }
 
-    public void setLoginDate(Date loginDate)
-    {
+    public void setLoginDate(Date loginDate) {
         this.loginDate = loginDate;
     }
 
-    public SysDept getDept()
-    {
+    public SysDept getDept() {
         return dept;
     }
 
-    public void setDept(SysDept dept)
-    {
+    public void setDept(SysDept dept) {
         this.dept = dept;
     }
 
-    public List<SysRole> getRoles()
-    {
+    public List<SysRole> getRoles() {
         return roles;
     }
 
-    public void setRoles(List<SysRole> roles)
-    {
+    public void setRoles(List<SysRole> roles) {
         this.roles = roles;
     }
 
-    public Long[] getRoleIds()
-    {
+    public Long[] getRoleIds() {
         return roleIds;
     }
 
-    public void setRoleIds(Long[] roleIds)
-    {
+    public void setRoleIds(Long[] roleIds) {
         this.roleIds = roleIds;
     }
 
-    public Long[] getPostIds()
-    {
+    public Long[] getPostIds() {
         return postIds;
     }
 
-    public void setPostIds(Long[] postIds)
-    {
+    public void setPostIds(Long[] postIds) {
         this.postIds = postIds;
     }
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phoneNum", getPhoneNum())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("deptId", getDeptId())
+                .append("userName", getUserName())
+                .append("nickName", getNickName())
+                .append("email", getEmail())
+                .append("phoneNum", getPhoneNum())
+                .append("sex", getSex())
+                .append("avatar", getAvatar())
+                .append("password", getPassword())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .append("loginIp", getLoginIp())
+                .append("loginDate", getLoginDate())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("dept", getDept())
+                .append("dataPermission", getDataPermission())
+                .toString();
     }
 }

base-system/src/main/java/com/ozs/system/domain/SysUserRole.java

@@ -20,7 +20,7 @@ public class SysUserRole {
     /**
      * 用户ID
      */
-    private Long id;
+    private Long userId;
 
     /**
      * 角色ID
@@ -30,7 +30,7 @@ public class SysUserRole {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
+                .append("id", getUserId())
                 .append("roleId", getRoleId())
                 .toString();
     }

base-system/src/main/java/com/ozs/system/mapper/SysUserMapper.java

@@ -143,4 +143,12 @@ public interface SysUserMapper extends JoinBaseMapper<SysUser> {
      * @return 结果
      */
     public boolean updatePassword(Long userId,String newPwd);
+
+    /**
+     * 数据权限分配
+     * @param id
+     * @param dataPermission
+     * @return
+     */
+    boolean dataPermission(@Param("id")Long id, @Param("dataPermission")int dataPermission);
 }

base-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -240,4 +240,12 @@ public interface ISysUserService extends JoinIService<SysUser> {
     public boolean updatePassword(Long userId, String newPwd);
 
     SysUser getUserByUserName(String username);
+
+    /**
+     * 数据权限分配
+     * @param id
+     * @param dataPermission
+     * @return
+     */
+    boolean dataPermission(Long id,Integer dataPermission);
 }

base-system/src/main/java/com/ozs/system/service/impl/SysRoleServiceImpl.java

@@ -377,7 +377,7 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
         List<SysUserRole> list = new ArrayList<SysUserRole>();
         for (Long id : Ids) {
             SysUserRole ur = new SysUserRole();
-            ur.setId(id);
+            ur.setUserId(id);
             ur.setRoleId(roleId);
             list.add(ur);
         }

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -389,7 +389,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
             for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
-                ur.setId(userId);
+                ur.setUserId(userId);
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
@@ -535,4 +535,9 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     public SysUser getUserByUserName(String username) {
         return userMapper.selectUserByUserName(username);
     }
+
+    @Override
+    public boolean dataPermission(Long id, Integer dataPermission) {
+      return   userMapper.dataPermission(id,dataPermission);
+    }
 }

base-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
         <result property="email"        column="email"        />
-        <result property="phoneNum"     column="phoneNum"  />
+        <result property="phoneNum"     column="phone_num"  />
         <result property="sex"          column="sex"          />
         <result property="avatar"       column="avatar"       />
         <result property="password"     column="password"     />
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.id,u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone_num, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.id,u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone_num, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,u.update_by,u.update_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="id != null and id != 0">
@@ -229,4 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updatePassword" parameterType="SysUser">
  		update sys_user set password = #{newPwd} where user_id = #{userId}
 	</update>
+	<delete id="dataPermission">
+ 		update sys_user set data_permission =#{dataPermission} where id = #{id}
+ 	</delete>
 </mapper>