Commit 8448aaf7 authored by hongguangwu's avatar hongguangwu

1.7.22-权限

parent cab64f29
...@@ -68,7 +68,8 @@ public class TEmpContractAlertController { ...@@ -68,7 +68,8 @@ public class TEmpContractAlertController {
@Operation(description = "自动化合同续签待办查询") @Operation(description = "自动化合同续签待办查询")
@GetMapping("/autoPage") @GetMapping("/autoPage")
public R<IPage<ContractAlertAutoVo>> getTEmpContractAlertAutoPage(Page<TEmpContractAlert> page, ContractAlertSearchVo tEmpContractAlert) { public R<IPage<ContractAlertAutoVo>> getTEmpContractAlertAutoPage(Page<TEmpContractAlert> page, ContractAlertSearchVo tEmpContractAlert) {
setAuth(tEmpContractAlert); YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tEmpContractAlert);
//默认开启自动化的 //默认开启自动化的
tEmpContractAlert.setAutoFlag(CommonConstants.ZERO_STRING); tEmpContractAlert.setAutoFlag(CommonConstants.ZERO_STRING);
return R.ok(tEmpContractAlertService.getTEmpContractAlertAutoPage(page,tEmpContractAlert)); return R.ok(tEmpContractAlertService.getTEmpContractAlertAutoPage(page,tEmpContractAlert));
...@@ -100,11 +101,18 @@ public class TEmpContractAlertController { ...@@ -100,11 +101,18 @@ public class TEmpContractAlertController {
**/ **/
@Operation(description = "自动化合同续签待办数量") @Operation(description = "自动化合同续签待办数量")
@GetMapping("/autoCount") @GetMapping("/autoCount")
public R<Integer> getTEmpContractAlertAutoCount() { public R<Integer> getTEmpContractAlertAutoCount(@RequestParam(required = false) String type, @RequestParam(required = false) String menuInfo) {
ContractAlertSearchVo tEmpContractAlert = new ContractAlertSearchVo(); ContractAlertSearchVo tEmpContractAlert = new ContractAlertSearchVo();
//默认开启自动化的 //默认开启自动化的
tEmpContractAlert.setAutoFlag(CommonConstants.ZERO_STRING); tEmpContractAlert.setAutoFlag(CommonConstants.ZERO_STRING);
setAuth(tEmpContractAlert); if (Common.isNotNull(type)) {
tEmpContractAlert.setType(type);
}
if (Common.isNotNull(menuInfo)) {
tEmpContractAlert.setMenuInfo(menuInfo);
}
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tEmpContractAlert);
return R.ok(tEmpContractAlertService.getTEmpContractAlertAutoCount(tEmpContractAlert)); return R.ok(tEmpContractAlertService.getTEmpContractAlertAutoCount(tEmpContractAlert));
} }
......
...@@ -1110,8 +1110,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -1110,8 +1110,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
searchVo.setAuthSql(null); searchVo.setAuthSql(null);
return; return;
} }
if (Common.isNotNull(searchVo.getType()) && !CommonConstants.TWO_STRING.equals(searchVo.getType())) {
// 非待办监控,走原逻辑,待办监控,走权限配置 // 非待办监控,走原逻辑,待办监控,走权限配置
if (!(Common.isNotNull(searchVo.getType()) && CommonConstants.TWO_STRING.equals(searchVo.getType()))) {
//非管理员及SSC 走前端客服查询逻辑 //非管理员及SSC 走前端客服查询逻辑
searchVo.setCsLoginName(user.getUsername()); searchVo.setCsLoginName(user.getUsername());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment