Преглед на файлове

修改项目流转意见

lamphua преди 9 месеца
родител
ревизия
a7ed19075a
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3
    3
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java

+ 3
- 3
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java Целия файл

87
     @PostMapping
87
     @PostMapping
88
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
88
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
89
     {
89
     {
90
-        if (cmcProjectComment.getJyComment() != null && cmcProjectComment.getJyApprover() != null && cmcProjectComment.getJyApprovalTime() != null) {
90
+        if (cmcProjectComment.getJyComment() != null && cmcProjectComment.getJyApprover() == null && cmcProjectComment.getJyApprovalTime() == null) {
91
             cmcProjectComment.setJyApprover(getLoginUser().getUserId());
91
             cmcProjectComment.setJyApprover(getLoginUser().getUserId());
92
             cmcProjectComment.setJyApprovalTime(new Date());
92
             cmcProjectComment.setJyApprovalTime(new Date());
93
             return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
93
             return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
104
     @PutMapping
104
     @PutMapping
105
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
105
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
106
     {
106
     {
107
-        if (cmcProjectComment.getManageComment() != null && cmcProjectComment.getManageApprover() != null && cmcProjectComment.getManageApprovalTime() != null && cmcProjectComment.getScComment() == null) {
107
+        if (cmcProjectComment.getManageComment() != null && cmcProjectComment.getManageApprover() == null && cmcProjectComment.getManageApprovalTime() == null && cmcProjectComment.getScComment() == null) {
108
             cmcProjectComment.setManageApprover(getLoginUser().getUserId());
108
             cmcProjectComment.setManageApprover(getLoginUser().getUserId());
109
             cmcProjectComment.setManageApprovalTime(new Date());
109
             cmcProjectComment.setManageApprovalTime(new Date());
110
         }
110
         }
111
-        if (cmcProjectComment.getScComment() != null && cmcProjectComment.getScApprover() != null && cmcProjectComment.getScApprovalTime() != null) {
111
+        if (cmcProjectComment.getScComment() != null) {
112
             CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
112
             CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
113
             StringBuilder scApprover = new StringBuilder();
113
             StringBuilder scApprover = new StringBuilder();
114
             if (projectComment.getScApprover() == null)
114
             if (projectComment.getScApprover() == null)

Loading…
Отказ
Запис