소스 검색

Merge branch 'release/修复缺陷' into master

yangll 3 년 전
부모
커밋
2853918bcc

+ 1 - 3
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -67,13 +67,11 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     //@AutoLog(value = "客户信息-分页列表查询")
     @ApiOperation(value = "客户信息-分页列表查询", notes = "客户信息-分页列表查询")
     @GetMapping(value = "/list")
-    @PermissionData
-//    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
+    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
     public Result<IPage<SmsCheckCustomerInfo>> queryPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest request) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
         Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
         IPage<SmsCheckCustomerInfo> pageList = customerInfoService.page(page, queryWrapper);

+ 1 - 2
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -80,8 +80,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	//@AutoLog(value = "稽核任务-分页列表查询")
 	@ApiOperation(value="稽核任务-分页列表查询", notes="稽核任务-分页列表查询")
 	@GetMapping(value = "/list")
-	@PermissionData
-//	@PermissionData(pageComponent = "smscheck/modules/TaskList")
+	@PermissionData(pageComponent = "smscheck/modules/TaskList")
 	public Result<IPage<SmsCheckTask>> queryPageList(SmsCheckTask smsCheckTask,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,