Merge remote-tracking branch 'origin/feature_deptSelect_lpf'

# Conflicts:
#	esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
#	esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
#	esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java

@@ -29,6 +29,11 @@ public interface WorkAppMenuConstant {
      */
     String WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED = "10004";
 
+    /**
+     * 用户管理-待认证居民
+     */
+    String WORK_APP_MENU_CODE_MASTER_GROUP = "10011";
+
     /**
      * 消息
      */

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -181,8 +181,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
+                <nacos.ip>118.190.232.100</nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
                 <!--亿联小程序配置-->

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -295,6 +295,18 @@ public class SysDeptController {
         return new Result<List<UserSysDeptInfoResultDTO>>().ok(list);
     }
 
+    /**
+    * @describe: 获得部门类型
+    * @author wangtong
+    * @date 2020/5/15 14:44
+    * @param [deptId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getDeptTypeKey")
+    public Result getDeptTypeKey(Long deptId) {
+        return sysDeptService.getDeptTypeKey(deptId);
+    }
+
     /**
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -272,6 +272,15 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     List<UserSysDeptInfoResultDTO> listAllDeptInfo(UserSysDeptInfoFormDTO formDTO);
 
+    /**
+    * @describe: 获得部门类型
+    * @author wangtong
+    * @date 2020/5/15 14:46
+    * @param [deptId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result getDeptTypeKey(Long deptId);
+
     /**
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -9,17 +9,11 @@
 package com.elink.esua.epdc.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.db.handler.HandleHelper;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.commons.tools.constant.NumConstant;
-import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
-import com.elink.esua.epdc.commons.tools.constant.*;
 import com.elink.esua.epdc.commons.tools.constant.*;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
@@ -1059,6 +1053,19 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return list;
     }
 
+    @Override
+    public Result getDeptTypeKey(Long deptId) {
+//        if (StringUtils.isBlank(deptId)) {
+//            throw new RenException("部门ID不可为空");
+//        }
+        SysDeptEntity dept = baseDao.selectById(deptId);
+        if (null == dept) {
+            throw new RenException("未查到部门相关信息");
+        }
+        return new Result<String>().ok(dept.getTypeKey());
+    }
+
+
     @Override
     public List<UserSysDeptInfoResultDTO> queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO formDTO) {
         return baseDao.selectListUserSysDeptTypeKey(formDTO);

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

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -75,8 +76,8 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("whistlingDept")
-    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto) {
-        return workItemService.whistlingDept();
+        return workItemService.whistlingDept(formDto);
     }
 
     @PostMapping("handleSubmit")
@@ -127,7 +128,7 @@ public class ApiWorkItemController {
      *      * @Date 2020/1/13 16:48
      **/
     @GetMapping("handleCategory")
-    public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
+    public Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto) {
-        return workItemService.queryHandleCategories();
+        return workItemService.queryHandleCategories(formDto);
     }
 }

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

@@ -221,4 +221,17 @@ public class ApiWorkUserController {
         return workUserService.updateAvatar(avatar);
     }
 
+    
+    /**
+    * @describe: 获得部门类型
+    * @author wangtong
+    * @date 2020/5/15 14:37
+    * @param [avatar]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getDeptTypeKey")
+    public Result getDeptTypeKey(Long deptId) {
+        return workUserService.getDeptTypeKey(deptId);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -119,4 +119,14 @@ public interface AdminFeignClient {
      */
     @PostMapping(value="sys/user/modifyPwd", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result modifyPwd(ModifyPwdDTO dto);
+
+    /**
+    * @describe: 获得部门类型
+    * @author wangtong
+    * @date 2020/5/15 14:41
+    * @param [deptId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -8,7 +8,6 @@ import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
-import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
 import com.elink.esua.epdc.feign.fallback.WorkIssueFeignClientFallback;

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -69,7 +70,7 @@ public interface WorkItemFeignClient {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping(value = "events/work/item/whistlingDept", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto);
 
     /**
      * 项目处理
@@ -118,6 +119,6 @@ public interface WorkItemFeignClient {
      * @Description 获取当前部门可做操作
      * @Date 2020/1/13 16:53
      **/
-    @GetMapping(value = "events/work/item/handleCategory")
+    @GetMapping(value = "events/work/item/handleCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ItemHandleResultDTO>> queryHandleCategories();
+    Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -63,4 +63,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result modifyPwd(ModifyPwdDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "modifyPwd",dto);
     }
+
+    @Override
+    public Result getDeptTypeKey(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -39,8 +40,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO);
     }
     @Override
-    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept",formDto);
     }
     @Override
     public Result handleSubmit(ItemHandleSubmitFormDTO dto) {
@@ -62,8 +63,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
     }
 
     @Override
-    public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
+    public Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories",formDto);
     }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -52,7 +53,7 @@ public interface WorkItemService {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
      */
-    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto);
     /**
      * 项目处理
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
@@ -95,5 +96,5 @@ public interface WorkItemService {
      * @Description 获取当前部门可做操作
      * @Date 2020/1/13 16:49
      **/
-    Result<List<ItemHandleResultDTO>> queryHandleCategories();
+    Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -157,4 +157,13 @@ public interface WorkUserService {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result updateAvatar(String avatar);
+
+    /**
+    * @describe: 获得部门类型
+    * @author wangtong
+    * @date 2020/5/15 14:38
+    * @param [deptId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result getDeptTypeKey(Long deptId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -50,8 +51,8 @@ public class WorkItemServiceImpl implements WorkItemService {
         return workItemFeignClient.evaluation(evaluationFormDTO);
     }
     @Override
-    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto) {
-        return workItemFeignClient.whistlingDept();
+        return workItemFeignClient.whistlingDept(formDto);
     }
 
     @Override
@@ -76,8 +77,8 @@ public class WorkItemServiceImpl implements WorkItemService {
     }
 
     @Override
-    public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
+    public Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto) {
-        return workItemFeignClient.queryHandleCategories();
+        return workItemFeignClient.queryHandleCategories(formDto);
     }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -360,4 +360,9 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Result updateAvatar(String avatar) {
         return adminFeignClient.updateAvatar(avatar);
     }
+
+    @Override
+    public Result getDeptTypeKey(Long deptId) {
+        return adminFeignClient.getDeptTypeKey(deptId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 部门信息
+ * @author: wangtong
+ * @create: 2020-05-14 16:11
+ **/
+@Data
+public class EventDeptFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1312338619441938926L;
+
+    private Long deptId;
+
+}

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

@@ -38,4 +38,16 @@ public class EpdcEventsReviewFormDTO implements Serializable {
     private String advice;
 
     private List<String> images;
+
+    /**
+     *操作部门ID
+     */
+    @NotNull(message = "操作部门ID不能为空")
+    private Long handlerDeptId;
+
+    /**
+     *操作部门名称
+     */
+    @NotBlank(message = "操作部门名称不能为空")
+    private String handlerDept;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.dto.issue.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -36,4 +37,16 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable {
      */
     private List<String> images;
 
+    /**
+     * 操作人部门ID
+     */
+    @NotNull(message = "操作人部门ID不能为空")
+    private Long handlerDeptId;
+
+    /**
+     * 操作人部门
+     */
+    @NotBlank(message = "操作人部门不能为空")
+    private String handlerDept;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HandleResultDTOSFormDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 获取处理方式FormDTO
+ * @Author wanggongfeng
+ * @Date 2020/05/15 15:04
+ */
+@Data
+public class HandleResultDTOSFormDTO implements Serializable {
+    private static final long serialVersionUID = -7871958578795227805L;
+
+    /**
+     * 项目ID
+     */
+    @NotBlank(message = "项目ID不能为空")
+    private String itemId;
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "操作人部门ID不能为空")
+    private Long deptId;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java

@@ -62,4 +62,21 @@ public class ItemHandleSubmitFormDTO implements Serializable {
      * 满意度评价部门
      */
     private List<ItemEvaluateDeptDTO> evaluateDeptDTOS;
+
+    /**
+     *部门键类型
+     */
+    private String typeKey;
+
+    /**
+     *操作部门ID
+     */
+    @NotNull(message = "操作人部门ID不能为空")
+    private Long handlerDeptId;
+
+    /**
+     * 操作人部门
+     */
+    @NotBlank(message = "操作人部门不能为空")
+    private String handlerDept;
 }

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

@@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventIssueItemState;
@@ -44,13 +43,13 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
-import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
+import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
-import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
@@ -230,6 +229,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_EVENT);
         informationFormDTO.setBusinessId(eventsEntity.getId());
 
+        if (dto.getHandlerDeptId().longValue() != eventsEntity.getGridId().longValue()) {
+            return new Result().error("请选择正确的处理部门");
+        }
+
         // 审核通过
         if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) {
             // 事件插入议题表
@@ -240,9 +243,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             issueHandleEntity.setIssueId(issueEntity.getId());
             issueHandleEntity.setState(EventIssueItemState.ISSUE_HANDLED_PASS);
             issueHandleEntity.setAdvice(dto.getAdvice());
-            UserDetail user = SecurityUser.getUser();
+            issueHandleEntity.setHandlerDeptId(dto.getHandlerDeptId());
-            issueHandleEntity.setHandlerDeptId(user.getDeptId());
+            issueHandleEntity.setHandlerDept(dto.getHandlerDept());
-            issueHandleEntity.setHandlerDept(user.getDeptName());
+//            UserDetail user = SecurityUser.getUser();
+            /*issueHandleEntity.setHandlerDeptId(user.getDeptId());
+            issueHandleEntity.setHandlerDept(user.getDeptName());*/
             issueHandleService.insert(issueHandleEntity);
 
             informationFormDTO.setBusinessId(issueEntity.getId());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -90,4 +91,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}")
     Result<List<String>> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId);
+
+
+    /**
+     * @describe: 获得部门类型
+     * @author wangtong
+     * @date 2020/5/15 14:41
+     * @param [deptId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java

@@ -54,4 +54,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<String>> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysGridLeaderPhone", deptId);
     }
+
+    @Override
+    public Result getDeptTypeKey(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
+    }
 }

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

@@ -187,9 +187,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         handleEntity.setAdvice(dto.getAdvice());
         handleEntity.setState(dto.getState());
         handleEntity.setIssueId(dto.getId());
-        UserDetail user = SecurityUser.getUser();
+        handleEntity.setHandlerDeptId(dto.getHandlerDeptId());
-        handleEntity.setHandlerDeptId(user.getDeptId());
+        handleEntity.setHandlerDept(dto.getHandlerDept());
-        handleEntity.setHandlerDept(user.getDeptName());
 
         IssueEntity issueEntity = new IssueEntity();
         issueEntity.setId(dto.getId());
@@ -205,6 +204,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         informationFormDTO.setBusinessId(entity.getId());
         informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent());
 
+        if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) {
+            return new Result().error("请选择正确的处理部门");
+        }
+
         // 反馈、关闭
         if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState() || EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
             issueHandleService.insert(handleEntity);
@@ -235,8 +238,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING);
                 itemHandleProcessEntity.setHandleAdvice(dto.getAdvice());
                 itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice());
-                itemHandleProcessEntity.setHandlerDeptId(user.getDeptId());
+                itemHandleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId());
-                itemHandleProcessEntity.setHandlerDept(user.getDeptName());
+                itemHandleProcessEntity.setHandlerDept(dto.getHandlerDept());
                 itemHandleProcessService.insert(itemHandleProcessEntity);
 
                 /**
@@ -250,8 +253,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
                 // 插入项目部门关联表
                 ItemDeptEntity itemDeptEntity = new ItemDeptEntity();
-                itemDeptEntity.setDeptId(SecurityUser.getDeptId());
+                itemDeptEntity.setDeptId(dto.getHandlerDeptId());
-                itemDeptEntity.setCreatedDeptId(SecurityUser.getDeptId());
+                itemDeptEntity.setCreatedDeptId(dto.getHandlerDeptId());
                 itemDeptEntity.setItemId(itemEntity.getId());
                 itemDeptService.insert(itemDeptEntity);
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -23,13 +23,14 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
+import com.elink.esua.epdc.dto.item.form.HandleResultDTOSFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO;
@@ -86,6 +87,20 @@ public class ItemController {
         return new Result<ItemDetailForPCEndResultDTO>().ok(data);
     }
 
+    /**
+     * 获取可操作处理
+     *
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.ItemDTO>
+     * @Author: wanggongfeng
+     * @Date: 2020/05/15 15:04
+     */
+    @PostMapping("getHandleResultDTOS")
+    public Result<ItemDetailForPCEndResultDTO> getHandleResultDTOS(@RequestBody HandleResultDTOSFormDTO dto) {
+        ItemDetailForPCEndResultDTO data = itemService.getHandleResultDTOS(dto);
+        return new Result<ItemDetailForPCEndResultDTO>().ok(data);
+    }
+
     @PostMapping
     public Result save(@RequestBody ItemDTO dto) {
         //效验数据

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.item.controller;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -105,8 +106,8 @@ public class WorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("whistlingDept")
-    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(@RequestBody EventDeptFormDTO formDto) {
-        return this.itemService.whistlingDept();
+        return this.itemService.whistlingDept(formDto);
     }
     /**
      * 项目处理提交--工作端
@@ -157,7 +158,7 @@ public class WorkItemController {
      * @Date 2020/1/13 16:55
      **/
     @GetMapping(value = "handleCategory")
-    public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
+    public Result<List<ItemHandleResultDTO>> queryHandleCategories(@RequestBody EventDeptFormDTO formDto) {
-        return itemService.queryHandleCategories();
+        return itemService.queryHandleCategories(formDto);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -345,4 +345,5 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @since 2020/3/7 16:39
      */
     List<ItemDTO> selectListOfCategoryInfo(String oldCategoryName);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -20,9 +20,10 @@ package com.elink.esua.epdc.modules.item.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
-import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.*;
@@ -94,6 +95,16 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     ItemDetailForPCEndResultDTO getItemDetailById(String id);
 
+    /**
+     * 获取可操作处理
+     *
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.ItemDTO>
+     * @Author: wanggongfeng
+     * @Date: 2020/05/15 15:04
+     */
+    ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto);
+
     /**
      * 默认保存
      *
@@ -192,7 +203,7 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
      */
-    Result<List<ItemCirculationDeptResultDTO>> whistlingDept();
+    Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto);
 
     /**
      * 项目分类统计
@@ -341,7 +352,7 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Description 获取当前部门可做操作
      * @Date 2020/1/13 16:55
      **/
-    Result<List<ItemHandleResultDTO>> queryHandleCategories();
+    Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto);
 
 
     /***

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

@@ -35,14 +35,11 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.constant.*;
 import com.elink.esua.epdc.constants.MenuCodeConstant;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.DeptGridPlatformDTO;
-import com.elink.esua.epdc.dto.MenuNoticeDTO;
-import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
-import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
 import com.elink.esua.epdc.dto.item.*;
@@ -158,6 +155,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private OssFeignClient ossFeignClient;
 
+
     @Override
     public PageData<ItemDTO> page(Map<String, Object> params) {
         IPage<ItemEntity> page = baseDao.selectPage(
@@ -324,13 +322,36 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public ItemDetailForPCEndResultDTO getItemDetailById(String id) {
         // 详情
         ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id);
-        UserDetail user = SecurityUser.getUser();
+        //获取项目基本信息
+        ItemEntity entity = this.selectById(id);
+        // 获取项目处理进度
+        List<ItemHandleProgressResultDTO> dtoList = baseDao.selectListOfItemHandleProgressByWork(id);
+        resultDTO.setHandleProgressResultDTOS(dtoList);
+        // 获取议题处理进度
+        List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
+        resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
+
+
+        return resultDTO;
+    }
+
+    @Override
+    public ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto) {
+        // 详情
+        ItemDetailForPCEndResultDTO resultDTO = new ItemDetailForPCEndResultDTO();
         // 获取已流转部门
-        List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId());
+        List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId());
+        Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId());
+        String typeKey = "";
+        if( 0 == deptMessage.getCode()){
+            typeKey = deptMessage.getData().toString();
+        }else{
+            throw new RenException(deptMessage.getMsg());
+        }
         // 获取可操作处理和可流转部门
-        switch (user.getTypeKey()) {
+        switch (typeKey) {
             case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY:
-                resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS);
+                resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS, dto.getDeptId());
                 break;
             case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY:
             case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT:
@@ -338,18 +359,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 resultDTO = this.getHandleCategory(resultDTO);
                 break;
             case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY:
-                resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS);
+                resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS, dto.getDeptId());
         }
-        //获取项目基本信息
-        ItemEntity entity = this.selectById(id);
-        // 获取项目处理进度
-        List<ItemHandleProgressResultDTO> dtoList = baseDao.selectListOfItemHandleProgressByWork(id);
-        resultDTO.setHandleProgressResultDTOS(dtoList);
-        // 获取议题处理进度
-        List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
-        resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
-
-
         return resultDTO;
     }
 
@@ -362,9 +373,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2019/9/16 13:40
      */
     private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO,
-                                                                                  List<ItemDeptDTO> itemDeptDTOS) {
+                                                                                  List<ItemDeptDTO> itemDeptDTOS,Long deptId) {
         // 可流转部门
-        Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId());
+        Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(deptId);
         if (!completeDept.success()) {
             throw new RenException("获取流转协助部门失败");
         }
@@ -415,7 +426,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         resultDTO.setDeptResultDTOS(deptResultDTOS);
 
         // 满意度评价部门
-        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), SecurityUser.getDeptId());
+        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId);
         resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS);
 
         return resultDTO;
@@ -450,13 +461,19 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2019/11/19 16:34
      */
     @Override
-    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto) {
-        UserDetail user = SecurityUser.getUser();
+        Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId());
+        String typeKey = "";
+        if( 0 == deptMessage.getCode()){
+            typeKey = deptMessage.getData().toString();
+        }else{
+            throw new RenException(deptMessage.getMsg());
+        }
         List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
         // 网格-可做操作和可流转部门
-        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
+        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) {
             // 可流转部门
-            Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId());
+            Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(formDto.getDeptId());
             if (!completeDept.success()) {
                 throw new RenException("获取流转协助部门失败");
             }
@@ -475,9 +492,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             circulationDeptStreetResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
             deptResultDTOS.add(circulationDeptStreetResultDTO);
 
-        } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) {
+        } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(typeKey)) {
             // 可流转部门
-            Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId());
+            Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(formDto.getDeptId());
             if (!listResult.success()) {
                 throw new RenException("获取流转协助部门失败");
             }
@@ -505,9 +522,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2019/9/16 16:17
      */
     private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfStreet(ItemDetailForPCEndResultDTO resultDTO,
-                                                                                    List<ItemDeptDTO> itemDeptDTOS) {
+                                                                                    List<ItemDeptDTO> itemDeptDTOS,Long deptId) {
         // 可流转部门
-        Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId());
+        Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(deptId);
         if (!listResult.success()) {
             throw new RenException("获取流转协助部门失败");
         }
@@ -579,7 +596,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Transactional(rollbackFor = Exception.class)
     public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) {
         try {
-            UserDetail user = SecurityUser.getUser();
+            Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
+            String typeKey = "";
+            if( 0 == deptMessage.getCode()){
+                typeKey = deptMessage.getData().toString();
+            }else{
+                throw new RenException(deptMessage.getMsg());
+            }
+            dto.setTypeKey(typeKey);
             ItemEntity entity = baseDao.selectById(dto.getId());
             // 组装发送消息内容
             EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
@@ -592,14 +616,26 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent());
 
             ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
-            handleProcessEntity.setHandlerDeptId(user.getDeptId());
+            handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId());
-            handleProcessEntity.setHandlerDept(user.getDeptName());
+            handleProcessEntity.setHandlerDept(dto.getHandlerDept());
             handleProcessEntity.setItemId(dto.getId());
             handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
             handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
-            handleProcessEntity.setHandlerDeptId(user.getDeptId());
 
             if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
+                // 吹哨
+                Result result = adminFeignClient.getCompleteDept(entity.getGridId());
+                Long streetId = 0L;
+                if( result.getCode() == 0){
+                    CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData();
+                    streetId = completeDeptDTO.getStreetId();
+                }else{
+                    throw new RenException(result.getMsg());
+                }
+                if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() && dto.getHandlerDeptId().longValue() != streetId.longValue()) {
+                    return new Result().error("请选择正确的处理部门");
+                }
+
                 // 项目流转校验
                 Result checkResult = this.checkItemCirculation(dto);
                 if (!checkResult.success()) {
@@ -608,13 +644,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 handleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING);
 
                 // 获取已流转部门信息
-                List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId());
+                List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId());
                 // 删除已流转协助部门
-                itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId());
+                itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId());
                 // 记录处理记录
                 itemHandleProcessService.insert(handleProcessEntity);
                 // 新增流转协助部门
-                itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto, handleProcessEntity.getId());
+                itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId());
                 List<ItemCirculationDeptResultDTO> circulationDeptResultDTOS = dto.getDeptResultDTOS();
                 List<Long> newDeptIds = new ArrayList<>();
                 for (ItemCirculationDeptResultDTO circulationDto :
@@ -651,8 +687,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
                 // 更新项目状态
-                if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
+                if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
-                        ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
+                    if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) {
+                        return new Result().error("请选择正确的处理部门");
+                    }
+
                     informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_CLOSED);
 
                     ItemEntity itemEntity = new ItemEntity();
@@ -663,7 +702,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
                         informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_PROCESSED);
                         if (null != dto.getEvaluateDeptDTOS()) {
-                            itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId());
+                            itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), dto.getHandlerDeptId());
                         }
                     }
                 }
@@ -682,20 +721,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             itemInfoDto.setBusinessType(dto.getHandleCategory());
             itemInfoDto.setAssociatedBusinessId(dto.getId());
             itemInfoDto.setAssociatedBusinessContent(entity.getItemContent());
-            itemInfoDto.setHandleDeptId(user.getDeptId());
+            itemInfoDto.setHandleDeptId(dto.getHandlerDeptId());
-            itemInfoDto.setHandleDept(user.getDeptName());
+            itemInfoDto.setHandleDept(dto.getHandlerDept());
             itemInfoDto.setHandleAdvice(dto.getHandleAdvice());
             itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO);
             // 回应处理
             if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) {
                 // 社区党工委和街道党工委处理
-                if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) {
+                if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(typeKey)) {
                     //插入项目消息表（仅网格）
                     // 通知部门Id（网格）
                     itemInfoDto.setDeptId(entity.getGridId().toString());
                     itemInformationService.insert(itemInfoDto);
                     // 街道部门和区直部门
-                } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
+                } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(typeKey)) {
                     //插入项目消息表（网格和街道）
                     // 通知部门Id（网格）
                     itemInfoDto.setDeptId(entity.getGridId().toString());
@@ -735,7 +774,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 // 关闭和结案处理
             } else {
                 // 查询已吹哨部门
-                List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId());
+                List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId());
                 // 遍历被吹哨部门插入项目消息表
                 for (Long itemDeptId : oldDeptIds) {
                     // 通知部门Id（被吹哨部门）
@@ -751,12 +790,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             newsTask.insertUserInformation(informationFormDTO);
 
             // 发送菜单消息-待处理项目
-            if (entity.getGridId().equals(user.getDeptId())) {
+            if (entity.getGridId().equals(dto.getHandlerDeptId())) {
                 // 网格长操作-发送菜单消息
                 this.sendItemHandleMenuNotice(entity.getGridId(), null);
             } else {
                 // 吹哨部门操作-发送菜单消息
-                this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null);
+                this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(dto.getHandlerDeptId()), null);
             }
             //项目外部处理意见图片保存
             if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) {
@@ -822,9 +861,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
 
         // 如果当前流转协助是网格发起，判断其街道党工委是否已将该项目流转协助
-        UserDetail user = SecurityUser.getUser();
+        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
-        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
+            Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(dto.getHandlerDeptId());
-            Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId());
             if (!completeDept.success()) {
                 return new Result().error("获取机构信息失败，请稍后重试");
             }
@@ -1138,7 +1176,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity();
         itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId());
         itemGridPlatformEntity.setTaskid(gridDto.getTaskId());
-        itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId());
+        itemGridPlatformEntity.setReportPersonDeptId(handleProcessEntity.getHandlerDeptId());
         itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue());
         itemGridPlatformService.insert(itemGridPlatformEntity);
 
@@ -1279,7 +1317,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2020-01-09
      */
     private void workProjectHandle(ItemHandleSubmitFormDTO dto){
-        UserDetail user = SecurityUser.getUser(); //获取当前登录人信息
         List<Long> deptId = new ArrayList<>();
         if(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()){
             List<ItemCirculationDeptResultDTO>  deptList = dto.getDeptResultDTOS();
@@ -1287,18 +1324,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i);
                 deptId.add(indexDto.getDeptId());
             }
-            issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信
+            issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信
-            if (user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理
+            if (dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理
                 this.superiorDeptSmsHandle(dto);
             }
         } else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
                 ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){
-            deptId = baseDao.queryDeptIdList(dto.getId(),user.getDeptId());
+            deptId = baseDao.queryDeptIdList(dto.getId(),dto.getHandlerDeptId());
             if (deptId != null && deptId.size() > 0){
-                issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
+                issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
             }
         } else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){
-            if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应
+            if (!dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应
                 this.superiorDeptSmsHandle(dto);
             }
         }else if(ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){ //上报网格化平台
@@ -1315,9 +1352,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2020-01-14
      */
     private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){
-        UserDetail user = SecurityUser.getUser(); //获取当前登录人信息
         List<Long> deptId = new ArrayList<>();
-        Long queryDePtId = user.getDeptId();
+        Long queryDePtId = dto.getHandlerDeptId();
         while (true){
             List<Long> createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId);
             if (createdDeptId != null && createdDeptId.size() > 0){
@@ -1330,7 +1366,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
         }
         if (deptId != null && deptId.size() > 0) {
-            issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//做回应处理，向部门下的所有人员发送短信
+            issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信
         }
     }
     /**
@@ -1360,11 +1396,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date 2020/1/13 16:55
      **/
     @Override
-    public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
+    public Result<List<ItemHandleResultDTO>> queryHandleCategories(EventDeptFormDTO formDto) {
         List<ItemHandleResultDTO> itemHandleResultDTOList = new ArrayList<>();
-        UserDetail userDetail = SecurityUser.getUser();
+        Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId());
+        String typeKey = "";
+        if( 0 == deptMessage.getCode()){
+            typeKey = deptMessage.getData().toString();
+        }else{
+            throw new RenException(deptMessage.getMsg());
+        }
         // 获取可操作处理和可流转部门
-        switch (userDetail.getTypeKey()) {
+        switch (typeKey) {
             case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY:
                 itemHandleResultDTOList = ItemHandleCategoryEnum.getHandleCategoriesForGird(false);
                 break;