fead:医生管理

admin-ui/src/components/cropper.vue

@@ -6,8 +6,8 @@
 		<el-image
 			v-if="value"
 			:fit="'contain'"
-			style="width: 20%; margin-top: 10px; border-radius: 5px; margin-bottom: -15px"
-			:style="{ width: head ? '100%' : '20%' }"
+			style="width: 15%; margin-top: 10px; border-radius: 5px; margin-bottom: -15px"
+			:style="{ width: head ? '100%' : '15%' }"
 			:z-index="50000"
 			:src="baseUrl + value"
 			:preview-src-list="[baseUrl + value]"

admin-ui/src/views/system/user/edit.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="cmain">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="证件照" prop="avatar"><cropper v-model="form.avatar" :fixed_number="[1, 1.5]"></cropper></el-form-item>
       <el-row>
         <el-col :span="12">
           <el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
@@ -35,8 +36,8 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="简介" prop="remark">
-        <editor v-model="form.remark" placeholder="请输入"></editor>
+      <el-form-item label="简介" prop="introduce">
+        <editor v-model="form.introduce" placeholder="请输入"></editor>
       </el-form-item>
     </el-form>
     <div class="mfooter">

admin-ui/src/views/system/user/index.vue

@@ -152,7 +152,7 @@ export default {
         phonenumber: undefined,
         status: undefined,
         deptId: undefined,
-        orderByColumn: 'create_time',
+        orderByColumn: 'userId',
         isAsc: 'desc'
       }
     };

app/common/common.scss

@@ -96,7 +96,7 @@
 		left: 33%;
 		z-index: 1;
 		background-color: white;
-		.contents{
+		.contents {
 			padding: 10px 10px 50px 10px;
 			font-size: 14px;
 		}
@@ -109,14 +109,16 @@
 				&:first-child {
 					padding-top: 0px;
 				}
-				.con {
-					.labels {
-						float: left;
-						font-size: 14px;
-						color: $font-c;
-						padding-top: 5px;
-						padding-right: 15px;
-					}
+				.avatar {
+					width: 70px;
+					height: 100px;
+					border-radius: 5px;
+					float: left;
+				}
+				.name {
+					float: left;
+					padding-left: 12px;
+					padding-top: 30px;
 				}
 			}
 		}

app/pages.json

@@ -84,6 +84,13 @@
 			{
 				"navigationBarTitleText" : "科室介绍"
 			}
+		},
+		{
+			"path" : "pages/doctor/detail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "医生介绍"
+			}
 		}
 	],
 	"tabBar": {

app/pages/doctor/detail.vue

@@ -0,0 +1,64 @@
+<template>
+	<view class="main">
+		<view class="content">
+			<view class="top">
+				<image :src="ip + item.avatar" mode="widthFix" class="avatar" v-if="item.avatar"></image>
+				<view class="title">{{ item.name }}</view>
+			</view>
+			<view class="con">
+				<u-divider text="人物介绍"></u-divider>
+				<u-parse :content="item.remark"></u-parse>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			ip: this.http.ip,
+			item: {}
+		};
+	},
+	onLoad(e) {
+		this.http.request({
+			url: '/app/doctor/detail/' + e.id,
+			success: (res) => {
+				this.item = res.data.data;
+				this.item.remark = res.data.data.remark.replace(new RegExp('/profile/upload/', 'g'), this.http.ip + '/profile/upload/');
+			}
+		});
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.main {
+	padding: 0px 10px 10px 10px;
+}
+.content {
+	padding: 15px;
+	background-color: white;
+	border-radius: 8px;
+	.top {
+		text-align: center;
+		.avatar {
+			width: 55%;
+			border-radius: 5px;
+		}
+		.title {
+			font-size: 18px;
+			padding-top: 3px;
+		}
+	}
+	.con {
+		font-size: 14px;
+		line-height: 23px;
+		image {
+			border-radius: 5px !important;
+		}
+	}
+}
+</style>

app/pages/doctor/index.vue

@@ -9,8 +9,8 @@
 		</view>
 		<view class="right">
 			<view class="list">
-				<view v-for="(item, index) in doctor_list" :key="index" class="item">
-					<image src="../../static/tx.jpg" mode="widthFix" class="head"></image>
+				<view v-for="(item, index) in doctor_list" :key="index" class="item" @click="go('/pages/doctor/detail?id=' + item.id)">
+					<image :src="item.avatar ? ip + item.avatar : '../../static/head.png'" mode="aspectFit" class="avatar"></image>
 					<view class="name">{{ item.name }}</view>
 				</view>
 			</view>
@@ -22,6 +22,7 @@
 export default {
 	data() {
 		return {
+			ip: this.http.ip,
 			doctor_list: {},
 			current: -1,
 			list: []
@@ -48,6 +49,9 @@ export default {
 					this.doctor_list = res.data.data;
 				}
 			});
+		},
+		go(url) {
+			uni.navigateTo({ url: url });
 		}
 	}
 };

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -153,8 +153,8 @@ public class SysUserController extends BaseController {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
-        int row = userService.updateUser(user);
-        if (row > 0) {
+        boolean row = userService.updateUser(user);
+        if (row) {
             if (!Arrays.equals(user.getRoleIds(), roles.toArray())) {
                 permissionService.refreshUserPermission(user.getUserId());
             }

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

@@ -1,13 +1,16 @@
 package com.ruoyi.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -20,139 +23,94 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@Data
+@TableName(value = "sys_user")
+@Accessors(chain = true)
 public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 用户ID
-     */
+    @TableId
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    /**
-     * 部门ID
-     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /**
-     * 用户账号
-     */
-    @Excel(name = "登录名称")
+    @Excel(name = "用户账号")
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     private String userName;
 
-    /**
-     * 用户昵称
-     */
     @Excel(name = "用户名称")
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
     private String nickName;
 
-    /**
-     * 用户邮箱
-     */
     @Excel(name = "用户邮箱")
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
     private String email;
 
-    /**
-     * 手机号码
-     */
     @Excel(name = "手机号码")
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
     private String phonenumber;
 
-    /**
-     * 用户性别
-     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /**
-     * 用户头像
-     */
     private String avatar;
 
-    /**
-     * 密码
-     */
+    private String introduce;
+
+    private String brief;
+
     private String password;
 
-    /**
-     * 帐号状态（0正常 1停用）
-     */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
     private String delFlag;
 
-    /**
-     * 最后登录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)
     })
+    @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;
 
+    @TableField(exist = false)
     private String rolesGroup;
 
-    public String getRolesGroup() {
-        return rolesGroup;
-    }
-
-    public void setRolesGroup(String rolesGroup) {
-        this.rolesGroup = rolesGroup;
-    }
-
-    public SysUser() {
-
-    }
-
-    public SysUser(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
     public boolean isAdmin() {
         return isAdmin(this.userId);
     }
@@ -161,172 +119,4 @@ public class SysUser extends BaseEntity {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp() {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp) {
-        this.loginIp = loginIp;
-    }
-
-    public Date getLoginDate() {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate) {
-        this.loginDate = loginDate;
-    }
-
-    public SysDept getDept() {
-        return dept;
-    }
-
-    public void setDept(SysDept dept) {
-        this.dept = dept;
-    }
-
-    public List<SysRole> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(List<SysRole> roles) {
-        this.roles = roles;
-    }
-
-    public Long[] getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getPostIds() {
-        return postIds;
-    }
-
-    public void setPostIds(Long[] postIds) {
-        this.postIds = postIds;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("userId", getUserId())
-                .append("deptId", getDeptId())
-                .append("userName", getUserName())
-                .append("nickName", getNickName())
-                .append("email", getEmail())
-                .append("phonenumber", getPhonenumber())
-                .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();
-    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -561,7 +561,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         String txtcontent = strHtml.replaceAll("</?[^>]+>", ""); //剔出<html>的标签
         txtcontent = txtcontent.replaceAll("<a>\\s*|\t|\r|\n</a>", "");//去除字符串中的空格,回车,换行符,制表符
         txtcontent = txtcontent.replaceAll("\\&[a-zA-Z]{1,10};", "").replaceAll("<[^>]*>", "").replaceAll("[(/>)<]", "").replaceAll("\r\n", "").replaceAll(" ", "").trim();
-        return txtcontent.substring(0, txtcontent.length() > 80 ? 150 : txtcontent.length());
+        return txtcontent.substring(0, txtcontent.length() > 80 ? 100 : txtcontent.length());
     }
 
     public static String getRandomString(int count) {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -12,7 +13,7 @@ import java.util.Map;
  *
  * @author ruoyi
  */
-public interface SysUserMapper {
+public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 根据条件分页查询用户列表
      *
@@ -128,9 +129,9 @@ public interface SysUserMapper {
     public SysUser checkEmailUnique(String email);
 
 
-    @Select("SELECT user_id AS id,nick_name AS name,avatar FROM sys_user WHERE dept_id=#{deptId} AND status='0'  ORDER BY user_id DESC")
+    @Select("SELECT user_id AS id,nick_name AS name,avatar,brief FROM sys_user WHERE dept_id=#{deptId} AND status='0'  ORDER BY user_id DESC")
     List<Map<String, Object>> selectDoctor(@Param("deptId") Long deptId);
 
-    @Select("SELECT nick_name AS name,avatar,remark FROM sys_user WHERE user_id=#{userId} AND status='0'")
+    @Select("SELECT nick_name AS name,avatar,introduce FROM sys_user WHERE user_id=#{userId} AND status='0'")
     Map<String, Object> detail(@Param("userId") Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,14 +12,14 @@ import java.util.Map;
  *
  * @author ruoyi
  */
-public interface ISysUserService {
+public interface ISysUserService extends IService<SysUser> {
     /**
      * 根据条件分页查询用户列表
      *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUserList(SysUser user);
+    List<SysUser> selectUserList(SysUser user);
 
     /**
      * 根据条件分页查询已分配用户角色列表
@@ -26,7 +27,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectAllocatedList(SysUser user);
+    List<SysUser> selectAllocatedList(SysUser user);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -34,7 +35,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUnallocatedList(SysUser user);
+    List<SysUser> selectUnallocatedList(SysUser user);
 
     /**
      * 通过用户名查询用户
@@ -42,7 +43,7 @@ public interface ISysUserService {
      * @param userName 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName(String userName);
+    SysUser selectUserByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -50,7 +51,7 @@ public interface ISysUserService {
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    SysUser selectUserById(Long userId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -58,7 +59,7 @@ public interface ISysUserService {
      * @param userName 用户名
      * @return 结果
      */
-    public String selectUserRoleGroup(String userName);
+    String selectUserRoleGroup(String userName);
 
     /**
      * 根据用户ID查询用户所属岗位组
@@ -66,7 +67,7 @@ public interface ISysUserService {
      * @param userName 用户名
      * @return 结果
      */
-    public String selectUserPostGroup(String userName);
+    String selectUserPostGroup(String userName);
 
     /**
      * 校验用户名称是否唯一
@@ -74,7 +75,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public String checkUserNameUnique(SysUser user);
+    String checkUserNameUnique(SysUser user);
 
     /**
      * 校验手机号码是否唯一
@@ -82,7 +83,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public String checkPhoneUnique(SysUser user);
+    String checkPhoneUnique(SysUser user);
 
     /**
      * 校验email是否唯一
@@ -90,21 +91,21 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public String checkEmailUnique(SysUser user);
+    String checkEmailUnique(SysUser user);
 
     /**
      * 校验用户是否允许操作
      *
      * @param user 用户信息
      */
-    public void checkUserAllowed(SysUser user);
+    void checkUserAllowed(SysUser user);
 
     /**
      * 校验用户是否有数据权限
      *
      * @param userId 用户id
      */
-    public void checkUserDataScope(Long userId);
+    void checkUserDataScope(Long userId);
 
     /**
      * 新增用户信息
@@ -112,7 +113,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public int insertUser(SysUser user);
+    boolean insertUser(SysUser user);
 
     /**
      * 注册用户信息
@@ -120,7 +121,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public boolean registerUser(SysUser user);
+    boolean registerUser(SysUser user);
 
     /**
      * 修改用户信息
@@ -128,7 +129,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public int updateUser(SysUser user);
+    boolean updateUser(SysUser user);
 
     /**
      * 用户授权角色
@@ -136,7 +137,7 @@ public interface ISysUserService {
      * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserAuth(Long userId, Long[] roleIds);
+    void insertUserAuth(Long userId, Long[] roleIds);
 
     /**
      * 修改用户状态
@@ -144,7 +145,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public int updateUserStatus(SysUser user);
+    int updateUserStatus(SysUser user);
 
     /**
      * 修改用户基本信息
@@ -152,7 +153,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public int updateUserProfile(SysUser user);
+    int updateUserProfile(SysUser user);
 
     /**
      * 修改用户头像
@@ -161,7 +162,7 @@ public interface ISysUserService {
      * @param avatar   头像地址
      * @return 结果
      */
-    public boolean updateUserAvatar(String userName, String avatar);
+    boolean updateUserAvatar(String userName, String avatar);
 
     /**
      * 重置用户密码
@@ -169,7 +170,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 结果
      */
-    public int resetPwd(SysUser user);
+    int resetPwd(SysUser user);
 
     /**
      * 重置用户密码
@@ -178,7 +179,7 @@ public interface ISysUserService {
      * @param password 密码
      * @return 结果
      */
-    public int resetUserPwd(String userName, String password);
+    int resetUserPwd(String userName, String password);
 
     /**
      * 通过用户ID删除用户
@@ -186,7 +187,7 @@ public interface ISysUserService {
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    int deleteUserById(Long userId);
 
     /**
      * 批量删除用户信息
@@ -194,7 +195,7 @@ public interface ISysUserService {
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    int deleteUserByIds(Long[] userIds);
 
     /**
      * 导入用户数据
@@ -204,17 +205,19 @@ public interface ISysUserService {
      * @param operName        操作用户
      * @return 结果
      */
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+    String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     /**
      * 根据部门查询医生
+     *
      * @param deptId
      * @return
      */
-   List<Map<String, Object>> selectDoctor(Long deptId);
+    List<Map<String, Object>> selectDoctor(Long deptId);
 
     /**
      * 医生详情
+     *
      * @param userId
      * @return
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -34,7 +35,7 @@ import java.util.stream.Collectors;
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService {
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -231,12 +232,13 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     @Transactional
-    public int insertUser(SysUser user) {
+    public boolean insertUser(SysUser user) {
         // 新增用户信息
-        int rows = userMapper.insertUser(user);
+        boolean rows = save(user);
         // 新增用户岗位关联
         insertUserPost(user);
         // 新增用户与角色管理
+        user.setBrief(StringUtils.StripHT(user.getIntroduce()));
         insertUserRole(user);
         return rows;
     }
@@ -260,7 +262,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     @Transactional
-    public int updateUser(SysUser user) {
+    public boolean updateUser(SysUser user) {
         Long userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -270,7 +272,8 @@ public class SysUserServiceImpl implements ISysUserService {
         userPostMapper.deleteUserPostByUserId(userId);
         // 新增用户与岗位管理
         insertUserPost(user);
-        return userMapper.updateUser(user);
+        user.setBrief(StringUtils.StripHT(user.getIntroduce()));
+        return updateById(user);
     }
 
     /**
@@ -418,7 +421,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Transactional
     public int deleteUserByIds(Long[] userIds) {
         for (Long userId : userIds) {
-            checkUserAllowed(new SysUser(userId));
+            checkUserAllowed(new SysUser().setUserId(userId));
             checkUserDataScope(userId);
         }
         // 删除用户与角色关联

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

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="introduce"    column="introduce"       />
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
     </resultMap>
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.introduce,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,d.dept_name,from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,d.dept_name from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">