|
@@ -87,7 +87,7 @@ public class CmcProjectCommentController extends BaseController
|
87
|
87
|
@PostMapping
|
88
|
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
|
91
|
cmcProjectComment.setJyApprover(getLoginUser().getUserId());
|
92
|
92
|
cmcProjectComment.setJyApprovalTime(new Date());
|
93
|
93
|
return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
|
|
@@ -104,11 +104,11 @@ public class CmcProjectCommentController extends BaseController
|
104
|
104
|
@PutMapping
|
105
|
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
|
108
|
cmcProjectComment.setManageApprover(getLoginUser().getUserId());
|
109
|
109
|
cmcProjectComment.setManageApprovalTime(new Date());
|
110
|
110
|
}
|
111
|
|
- if (cmcProjectComment.getScComment() != null && cmcProjectComment.getScApprover() != null && cmcProjectComment.getScApprovalTime() != null) {
|
|
111
|
+ if (cmcProjectComment.getScComment() != null) {
|
112
|
112
|
CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
|
113
|
113
|
StringBuilder scApprover = new StringBuilder();
|
114
|
114
|
if (projectComment.getScApprover() == null)
|