修改BUG

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -126,7 +126,7 @@ public class ApiIssueController {
      * @Date: 2019/9/17 16:11
      */
     @GetMapping("listByUserId")
-    public Result<List<IssuesAndEventsOfMineResultDTO>> issuesAndEventsOfMine(@LoginUser TokenDto userDetail, @RequestBody IssuesAndEventsOfMineFormDTO formDTO) {
+    public Result<List<IssuesAndEventsOfMineResultDTO>> issuesAndEventsOfMine(@LoginUser TokenDto userDetail, IssuesAndEventsOfMineFormDTO formDTO) {
         return issueService.listIssuesAndEventsOfMine(userDetail, formDTO);
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@@ -90,7 +90,7 @@ public class ApiItemController {
      * @Date: 2019/9/17 13:27
      */
     @GetMapping("listByUserId")
-    public Result<List<ItemResultDTO>> listItemsOfMine(@LoginUser TokenDto userDetail, @RequestBody ItemOfMineFormDTO formDTO) {
+    public Result<List<ItemResultDTO>> listItemsOfMine(@LoginUser TokenDto userDetail, ItemOfMineFormDTO formDTO) {
         return itemService.listItemsOfMine(userDetail, formDTO);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java

@@ -34,10 +34,13 @@ public class EventCommentsFormDTO implements Serializable {
      * 时间戳(yyyy-MM-dd HH:mm:ss)
      */
     private String timestamp;
+    /**
+     * 项目ID
+     */
+    private String itemId;
     /**
      * 议题ID
      */
-    @NotBlank(message = "议题ID不能为空")
     private String issueId;
     /**
      * 事件ID

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@@ -226,10 +226,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
 
     @Override
     public Result<EventCommentsResultDTO> listOfComments(EventCommentsFormDTO formDTO) {
-        IssueEntity issueEntity = issueService.selectById(formDTO.getIssueId());
-        formDTO.setEventId(issueEntity.getEventId());
+        // 获取议题ID
+        if (StringUtils.isNotEmpty(formDTO.getIssueId())) {
+            IssueEntity issueEntity = issueService.selectById(formDTO.getIssueId());
+            formDTO.setEventId(issueEntity.getEventId());
+        } else {
+            ItemEntity itemEntity = itemService.selectById(formDTO.getItemId());
+            formDTO.setEventId(itemEntity.getEventId());
+        }
         // 表态数
-        long statementNum = baseDao.selectCountOfStatementNum(issueEntity.getEventId());
+        long statementNum = baseDao.selectCountOfStatementNum(formDTO.getEventId());
         int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageIndex(pageIndex);
         // 评论

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -292,7 +292,7 @@
         SELECT
             CREATED_TIME AS createdTime,
             advice,
-            case STATE WHEN 0 THEN '审核' WHEN 1 THEN '反馈' WHEN '2' THEN '关闭' ELSE '' END AS stateName
+            case STATE WHEN 0 THEN '【审核】' WHEN 1 THEN '【反馈】' WHEN '2' THEN '【关闭】' ELSE '' END AS stateName
         FROM
             epdc_issue_handle
         WHERE

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDeptDao.xml

@@ -8,7 +8,7 @@
     </select>
 
     <update id="updateItemDepts">
-        UPDATE epdc_item_dept SET DEL_FLAG = '1' WHERE CREATED_DEPT_ID = #{createdDeptId} AND ITEM_ID = #{itemId}
+        UPDATE epdc_item_dept SET DEL_FLAG = '1' WHERE CREATED_DEPT_ID = #{createdDeptId} AND ITEM_ID = #{itemId} AND DEPT_ID != #{createdDeptId}
     </update>
 
     <select id="selectListOfEvaluateDepts" resultType="com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO">