BUGFIX:1.生成的图案在design时未加入到library
2.获取组织名时出现空字符串 TASK:1. 允许超级管理员按组织名查询用户design频次
This commit is contained in:
@@ -52,7 +52,8 @@ public class ConvenientInquiryController {
|
||||
@ApiOperation("获取指定时间区间内所有用户design的使用情况")
|
||||
@GetMapping("/getDesignStatistic")
|
||||
public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime,
|
||||
@RequestParam(required = false) List<Long> ids, @RequestParam(required = false) String email) {
|
||||
@RequestParam(required = false) List<Long> ids, @RequestParam(required = false) String email,
|
||||
@RequestParam(required = false) String organizationName) {
|
||||
/*Long accountId = UserContext.getUserHolder().getId();
|
||||
String userEmail = accountService.getById(accountId).getUserEmail();
|
||||
if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L)
|
||||
@@ -75,7 +76,7 @@ public class ConvenientInquiryController {
|
||||
} else {
|
||||
return Response.fail("Sorry, you don't have permission");
|
||||
}*/
|
||||
return Response.success(convenientInquiryService.getDesignStatistic(startTime, endTime, ids, email));
|
||||
return Response.success(convenientInquiryService.getDesignStatistic(startTime, endTime, ids, email, organizationName));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user