Compare commits

..

No commits in common. "e366b0dddf7263d3d4a2b81d6776338afd27e8a0" and "666a84892e7455790a5924e08579f8e8c028ae23" have entirely different histories.

1 changed files with 4 additions and 4 deletions

View File

@ -41,13 +41,13 @@ public class AppJjrController {
JjrApply entity = applyService.findByUserId(userId); JjrApply entity = applyService.findByUserId(userId);
if(entity!=null){ if(entity!=null){
if(entity.getStatus().equals(0)){ if(entity.getStatus().equals(0)){
return Result.error("申请审批中"); return Result.success("申请审批中");
} }
if(entity.getStatus().equals(1)){ if(entity.getStatus().equals(1)){
return Result.error("申请审批通过,请重新登录"); return Result.success("申请审批通过,请重新登录");
} }
if(entity.getStatus().equals(2)){ if(entity.getStatus().equals(2)){
return Result.error("申请审批被驳回,驳回原因如下:"+entity.getOpinion()); return Result.success("申请审批被驳回,驳回原因如下:"+entity.getOpinion());
} }
} }
JjrApply jjrApply = new JjrApply(); JjrApply jjrApply = new JjrApply();
@ -58,7 +58,7 @@ public class AppJjrController {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
jjrApply.setCreateTime(sdf.format(new Date())); jjrApply.setCreateTime(sdf.format(new Date()));
applyService.add(jjrApply); applyService.add(jjrApply);
return Result.success("申请成功,等待审批"); return Result.success();
} }