Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -34,6 +34,7 @@ import com.epmet.service.IcEventReplyService;
 import com.epmet.service.IcEventService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -235,7 +236,12 @@ public class IcEventController {
     public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setUserId(tokenDto.getUserId());
+        //如果选择网格员，则保存网格员ID为事件处理人ID
+        if(StringUtils.isNotEmpty(formDTO.getUserId())){
+            formDTO.setUserId(formDTO.getUserId());
+        }else {
+            formDTO.setUserId(tokenDto.getUserId());
+        }
         icEventService.reply(formDTO);
         return new Result();
     }