Merge branch 'huangzqa-fix-20210823' into 'master'

fix: 修复人员名称错误

See merge request dcuc-tjdsj/approve-core!92

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveLogBusinessImpl.java

@@ -774,7 +774,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         BaseSecurityUser currentUser = UserContextUtils.getCurrentUser();
         if (currentUser != null) {
             createUser = currentUser.getIdcard();
-            createUserName = currentUser.getUserName();
+            createUserName = currentUser.getName();
         } else {
             // 没有用户登陆的话使用凭据作为操作人
             String idcard = ProofsUtil.getIdcard();

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/vo/TaskRequestUserInfoDTO.java

@@ -50,7 +50,7 @@ public class TaskRequestUserInfoDTO {
 
         if (baseSecurityUser != null) {
             idCard = baseSecurityUser.getIdcard();
-            userName = baseSecurityUser.getUserName();
+            userName = baseSecurityUser.getName();
             orgCode = baseSecurityUser.getSecurityOrg();
             orgName = baseSecurityUser.getSecurityOrgName();
         }