zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://git.pig4cloud.com/361243819/pigx into dev

Browse Source
This commit is contained in:
lbw committed 2021-11-30 21:39:36 +08:00
2 parents 028ffa667a 1f01ad0b57
commit 08e7eccaf1
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java
+2 -2
View File
@@ -188,7 +188,7 @@ public class SysUserController {
*/ */
@ResponseExcel @ResponseExcel
@GetMapping("/export") @GetMapping("/export")
@PreAuthorize("@pms.hasPermission('sys_log_export')") @PreAuthorize("@pms.hasPermission('sys_user_export')")
public List export(UserDTO userDTO) { public List export(UserDTO userDTO) {
return userService.listUser(userDTO); return userService.listUser(userDTO);
} }
@@ -200,7 +200,7 @@ public class SysUserController {
* @return R * @return R
*/ */
@PostMapping("/import") @PostMapping("/import")
@PreAuthorize("@pms.hasPermission('sys_log_export')") @PreAuthorize("@pms.hasPermission('sys_user_export')")
public R importUser(@RequestExcel List<UserExcelVO> excelVOList, BindingResult bindingResult) { public R importUser(@RequestExcel List<UserExcelVO> excelVOList, BindingResult bindingResult) {
return userService.importUser(excelVOList, bindingResult); return userService.importUser(excelVOList, bindingResult);
} }