wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-10 10:04:06 +08:00
parent 0948d5f24f
commit dc6458b926
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/controller/TestController.java
View File

@ -267,7 +267,7 @@ public class TestController {
R r = resultRecordService.initFlowRecord(resultRecordId);
}
// http://localhost:8080/lz_management/test/getAuth?userId=314
// http://localhost:8080/lz_management/test/getAuth?userId=395
@RequestMapping("/test/getAuth")
public R getAuth(Long userId) throws Exception{
Map<String,Integer> map = staffRoleService.getRoleByUserId(userId);

6
src/main/java/com/lz/modules/sys/controller/SysUserController.java
View File

@ -18,6 +18,7 @@ import com.lz.common.validator.ValidatorUtils;
import com.lz.common.validator.group.AddGroup;
import com.lz.common.validator.group.UpdateGroup;
import com.lz.modules.app.entity.UserEntity;
import com.lz.modules.flow.service.StaffRoleService;
import com.lz.modules.sys.entity.SysUserEntity;
import com.lz.modules.sys.entity.SysUserEntityDto;
import com.lz.modules.sys.form.PasswordForm;
@ -45,6 +46,8 @@ public class SysUserController extends AbstractController {
private SysUserService sysUserService;
@Autowired
private SysUserRoleService sysUserRoleService;
@Autowired
private StaffRoleService staffRoleService;
/**
@ -72,7 +75,8 @@ public class SysUserController extends AbstractController {
SysUserEntity sysUserEntity = getUser();
SysUserEntityDto entityDto = new SysUserEntityDto();
BeanUtils.copyProperties(sysUserEntity, entityDto);
return R.ok().put("user", entityDto);
Map<String,Integer> map = staffRoleService.getRoleByUserId(getUserId());
return R.ok().put("user", entityDto).put("data",map);
}
/**