Browse Source

优化用户导出,更新用户

dev-active_learn
chenzhihang 10 months ago
parent
commit
77b53735ca
3 changed files with 17 additions and 10 deletions
  1. +16
    -4
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
  2. +0
    -5
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
  3. +1
    -1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

+ 16
- 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java View File

@@ -5,11 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
import com.alibaba.excel.enums.poi.VerticalAlignmentEnum; import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.core.xss.Xss;
import com.ruoyi.system.api.constant.Constant;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;


@@ -69,9 +67,11 @@ public class SysUser extends BaseEntity {
/** /**
* 用户性别 * 用户性别
*/ */
@ExcelProperty(value = "用户性别", order = 6)
private String sex; private String sex;


@ExcelProperty(value = "用户性别", order = 6)
private String sexName;

/** /**
* 用户头像 * 用户头像
*/ */
@@ -220,6 +220,18 @@ public class SysUser extends BaseEntity {
this.sex = sex; this.sex = sex;
} }


public String getSexName() {
if (Constant.Sex_Men.equals(this.sex)) {
return "男";
} else {
return "女";
}
}

public void setSexName(String sexName) {
this.sexName = sexName;
}

public String getAvatar() { public String getAvatar() {
return avatar; return avatar;
} }


+ 0
- 5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java View File

@@ -295,9 +295,4 @@ public class SysUserController extends BaseController {
public AjaxResult deptTree(SysDept dept) { public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept)); return success(deptService.selectDeptTreeList(dept));
} }

@GetMapping("/getOriginPwd")
public R<String> getOriginPwd(@RequestParam(value = "username") String username) {
return R.ok(userService.getOriginPwd(username));
}
} }

+ 1
- 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java View File

@@ -408,7 +408,7 @@ public class SysUserServiceImpl implements ISysUserService {
remoteAuthService.edit(user); remoteAuthService.edit(user);


// todo 更新火石平台用户 // todo 更新火石平台用户
SecurityUtils.getLoginUser().getSysUser().setOriginPassword(user.getOriginPassword());
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }




Loading…
Cancel
Save