【内容审核】-【初心互助-活动打卡-用户名获取修改】-（王童）-2020/07/08

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -37,6 +37,7 @@ import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
 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;
@@ -304,6 +305,10 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
     @Override
     public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
         //内容审核
+        String userName = null;
+        if(null != SecurityUser.getUser()){
+            userName = SecurityUser.getUser().getUsername();
+        }
         List<String> textList = new ArrayList<>();
         textList.add(appActUserClockLogDTO.getClockDesc());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@@ -312,11 +317,6 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 && 200 == contentResult.getDetails().get(0).getCode()
                 && 200 == imgResult.getDetails().get(0).getCode()) {
             if (!contentResult.getAllPass() || !imgResult.getAllPass()) {
-                String userName = "";
-                Result<UserDTO> user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
-                if (user.getData() != null) {
-                    userName = user.getData().getNickname();
-                }
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
@@ -367,11 +367,6 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 && 200 == imgResult.getDetails().get(0).getCode()) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-                String userName = "";
-                Result<UserDTO> user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
-                if (user.getData() != null) {
-                    userName = user.getData().getNickname();
-                }
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,