diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index bc0202cf..7d354778 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -82,6 +82,9 @@ public class SysUserController { } R rs = service.getBase(TbsSeeYonConst.OA_USER_INFO+"?code="+code,null); String listJson = rs.getMsg(); + if(listJson.equals("null")){ + return R.error("无相关工号的员工信息:"+code); + } return R.ok(JSONUtil.parse(listJson)); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 17f7cdfa..19c33f02 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -358,6 +358,7 @@ public class TbsCostApplyController { * 提交审批节点 * @return */ + @LimitSubmit @PostMapping("/commitAffair") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @PreAuthorize("hasRole('tbs:costApply:commit')") @@ -370,6 +371,7 @@ public class TbsCostApplyController { * @param id * @return */ + @LimitSubmit @PostMapping("/compensate/{id}") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) public R compensate(@PathVariable("id") String id){ @@ -381,6 +383,7 @@ public class TbsCostApplyController { * @param param * @return */ + @LimitSubmit @PostMapping("/addNode") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) public R addNode(@RequestBody CtpAddNodeParam param){ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index c906b2a4..cf682f82 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -128,7 +128,8 @@ public class TbsActivityServiceImpl extends ServiceImpl1?tmls[1]:"0"; Integer i = Integer.parseInt(tml); if(i>max){ max = i; diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 7c41b9c2..ca769501 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -416,6 +416,16 @@ public class TzcPolicyController { return tzcPolicyOperationService.getUnfinished(); } + /** + * 补偿按钮 + * @param id + * @return + */ + @PostMapping("/compensate/{id}") + public R compensate(@PathVariable("id") String id){ + //return vtbVerificationOperationService.runCompensate(id); + return R.ok(); + } } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java index 491aebf3..e7f09aea 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java @@ -89,7 +89,8 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl1?tmls[1]:"0"; Integer i = Integer.parseInt(tml); if(i>max){ max = i; @@ -126,6 +127,7 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index a70bbbd2..2308b765 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -282,6 +282,7 @@ public class VtbVerificationController { * 提交审批节点 * @return */ + @LimitSubmit @PostMapping("/commitAffair") @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @PreAuthorize("hasRole('tbs:costApply:commit')") @@ -295,6 +296,7 @@ public class VtbVerificationController { * @param param * @return */ + @LimitSubmit @PostMapping("/addNode") @SysLog(module = SystemModule.Verification, title = "核销加签", biz = BizType.OTHER) public R addNode(@RequestBody CtpAddNodeParam param){ @@ -315,6 +317,7 @@ public class VtbVerificationController { * @param id * @return */ + @LimitSubmit @PostMapping("/compensate/{id}") public R compensate(@PathVariable("id") String id){ return vtbVerificationOperationService.runCompensate(id);