Dlp-Gyjd/dlp-admin-service
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
陈江保
2025-08-19 14:26:34 +08:00
parent d2c50339df 196b1813a0
commit 8674fc6efe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/digital/laboratory/platform/sys/controller/UserController.java
View File

@@ -84,6 +84,7 @@ public class UserController {
vo.setRoles(userInfo.getRoles()); vo.setRoles(userInfo.getRoles());
vo.setPermissions(userInfo.getPermissions()); vo.setPermissions(userInfo.getPermissions());
vo.setOrg(userInfo.getOrg()); vo.setOrg(userInfo.getOrg());
user.setOrgName(userInfo.getOrg().getName());
return R.ok(vo); return R.ok(vo);
} }
@@ -479,7 +480,7 @@ public class UserController {
} }
@DeleteMapping("/del/signature/{userId}") @DeleteMapping("/del/signature/{userId}")
@ApiOperation(value = "删除电子签名",notes = "通过传入用户ID，直接删除该用户电子签名数据") @ApiOperation(value = "删除电子签名", notes = "通过传入用户ID，直接删除该用户电子签名数据")
public R deleteSignature(@PathVariable String userId) { public R deleteSignature(@PathVariable String userId) {
SysUser user = userService.getById(userId); SysUser user = userService.getById(userId);
if (user == null) { if (user == null) {