用户模块和角色模块修改

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

@@ -4,6 +4,8 @@ import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -53,15 +55,19 @@ public class SysRole extends BaseEntity
     private String delFlag;
 
     /** 用户是否存在此角色标识 默认不存在 */
+    @TableField(exist = false)
     private boolean flag = false;
 
     /** 菜单组 */
+    @TableField(exist = false)
     private Long[] menuIds;
 
     /** 部门组（数据权限） */
+    @TableField(exist = false)
     private Long[] deptIds;
 
     /** 角色菜单权限 */
+    @TableField(exist = false)
     private Set<String> permissions;
 
     public SysRole()

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -109,30 +110,40 @@ public class SysUser extends BaseEntity {
             @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
             @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
+    @TableField(exist = false)
     private SysDept dept;
 
     /**
      * 角色对象
      */
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /**
      * 角色组
      */
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /**
      * 岗位组
      */
+    @TableField(exist = false)
     private Long[] postIds;
 
     /**
      * 角色ID
      */
+    @TableField(exist = false)
     private Long roleId;
 
     private Integer dataPermission;
 
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
     public Integer getDataPermission() {
         return dataPermission;
     }
@@ -145,6 +156,14 @@ public class SysUser extends BaseEntity {
 
     }
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Long getId() {
         return id;
     }
@@ -341,6 +360,7 @@ public class SysUser extends BaseEntity {
                 .append("remark", getRemark())
                 .append("dept", getDept())
                 .append("dataPermission", getDataPermission())
+                .append("deptName",getDeptName())
                 .toString();
     }
 }

base-common/src/main/java/com/ozs/common/core/domain/vo/SysRoleRequestVo.java

@@ -0,0 +1,19 @@
+package com.ozs.common.core.domain.vo;
+
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SysRoleRequestVo extends PageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String roleName;
+    private String status;
+    private String  roleKey;
+    private String roleRemarks;
+    private Long roleId;
+}

base-common/src/main/java/com/ozs/common/core/domain/vo/SysUserVo.java

@@ -0,0 +1,45 @@
+package com.ozs.common.core.domain.vo;
+
+
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author hx
+ */
+@Data
+public class SysUserVo extends PageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    
+    /**
+     * 手机号码
+     */
+    private String phoneNum;
+
+   
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private Integer status;
+
+   
+}

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

@@ -337,7 +337,7 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenu(roleIds);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
+//        roleDeptMapper.deleteRoleDept(roleIds);
         return roleMapper.deleteRoleByIds(roleIds);
     }
 

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

@@ -76,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="phoneNum != null and phoneNum != ''">
 			AND u.phone_num like concat('%', #{phoneNum}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>
@@ -83,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
 		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+			AND u.dept_id = #{deptId}
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}