From d65d8b66f3e71c1979b434bc60840cd40960c441 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 6 Aug 2020 18:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E6=95=B4=E4=BD=93=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiActUserRelationController.java    |  2 ++
 .../esua/epdc/activity/AppActUserClockLogDTO.java   | 10 ++++++++++
 .../service/impl/ActUserClockLogServiceImpl.java    | 13 ++++---------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index cb1548091..2cecfc131 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -130,6 +130,8 @@ public class ApiActUserRelationController {
         ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO);
         AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class);
         appActUserClockLogDTO.setUserId(tokenDto.getUserId());
+        appActUserClockLogDTO.setUsername(tokenDto.getNickname());
+        appActUserClockLogDTO.setDeptId(tokenDto.getGridId());
         return actUserRelationService.activityClock(appActUserClockLogDTO);
 
     }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
index 548a238f5..0937b83a2 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
@@ -82,4 +82,14 @@ public class AppActUserClockLogDTO implements Serializable {
      */
     private Boolean isConReview = false;
 
+    /**
+     * 用户姓名
+     */
+    private String username;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 2bcfcf577..85f3057c6 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -38,7 +38,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
-import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -310,17 +309,13 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
     public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
         //内容审核
         Boolean isConReview = appActUserClockLogDTO.getIsConReview();
-        String userName = null;
-        if(null != SecurityUser.getUser()){
-            userName = SecurityUser.getUser().getUsername();
-        }
         String mobile = null;
         Result<UserDTO> user =  userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
         if(null != user.getData()){
             mobile = user.getData().getMobile();
         }
         // 获取所有上级机构名称和ID拼接
-        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+        ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(appActUserClockLogDTO.getDeptId()).getData();
         List<String> textList = new ArrayList<>();
         textList.add(appActUserClockLogDTO.getClockDesc());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@@ -329,7 +324,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 ((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
-                    userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
+                    appActUserClockLogDTO.getUsername(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
                     appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
@@ -372,7 +367,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         //接口异常，保存至待审核信息
         if((contentResult == null || imgResult == null) && !isConReview) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
-                    userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
+                    appActUserClockLogDTO.getUsername(), CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
                     appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1",deptDto);
             contentSecurityFeign.insertRecords(record);
         }
@@ -387,7 +382,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
-                        userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
+                        appActUserClockLogDTO.getUsername(), CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
                         appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }