审批+绩效

src/main/java/cn/timer/api/controller/jxgl/JxglController.java

@@ -726,6 +726,8 @@ public class JxglController {
 	@PutMapping(value = "/termination_performance_appraisal")
 	@PutMapping(value = "/termination_performance_appraisal")
 	@ApiOperation(value = "8.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核")
 	@ApiOperation(value = "8.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核")
 	@ApiOperationSupport(order = 8)
 	@ApiOperationSupport(order = 8)
+	@Role
+	@Log(title = "终止-绩效考核")
 	public Result<Object> terminationPA(@CurrentUser UserBean userBean,@NotNull @RequestParam Integer id) {
 	public Result<Object> terminationPA(@CurrentUser UserBean userBean,@NotNull @RequestParam Integer id) {
 
 
 		JxglPerformanceAppraisal performanceAppraisal = jxglPerformanceAppraisalMapper
 		JxglPerformanceAppraisal performanceAppraisal = jxglPerformanceAppraisalMapper
@@ -955,6 +957,7 @@ public class JxglController {
 	@ApiOperation(value = "13.终止-考核", httpMethod = "PUT", notes = "终止-考核")
 	@ApiOperation(value = "13.终止-考核", httpMethod = "PUT", notes = "终止-考核")
 	@ApiOperationSupport(order = 13)
 	@ApiOperationSupport(order = 13)
 	@Role
 	@Role
+	@Log(title = "终止-考核")
 	public Result<Object> terminationAssessment(@CurrentUser UserBean userBean, @NotNull @RequestParam Integer id) {
 	public Result<Object> terminationAssessment(@CurrentUser UserBean userBean, @NotNull @RequestParam Integer id) {
 
 
 		JxglAppraisal appraisal = jxglAppraisalMapper.selectById(id);
 		JxglAppraisal appraisal = jxglAppraisalMapper.selectById(id);

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -118,14 +118,14 @@ public class RouterUtils {
 						router.setFlow(true);
 						router.setFlow(true);
 						
 						
 						List<User> listUser = router.getRelation().get(0).getUsers();
 						List<User> listUser = router.getRelation().get(0).getUsers();
-						user:
+							user:
 							for (int i = 0; i < listUser.size(); i++) {
 							for (int i = 0; i < listUser.size(); i++) {
 								String execute = listUser.get(i).getExecute();
 								String execute = listUser.get(i).getExecute();
 								switch (execute) {
 								switch (execute) {
 								case UNEXECUTED:
 								case UNEXECUTED:
 									listUser.get(i).setExecute(EXECUTING);
 									listUser.get(i).setExecute(EXECUTING);
 									// 首次发起申请时，写入 审批人名称 至 obj 中
 									// 首次发起申请时，写入 审批人名称 至 obj 中
-									if (isFirse) {
+									if (isFirse && obj.getStr("current_approver") != null ) {
 										obj.set("current_approver", listUser.get(i).getName());
 										obj.set("current_approver", listUser.get(i).getName());
 									}
 									}