修正钉钉上架人员问题

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -521,6 +521,7 @@ public class DingDingServiceImpl implements DingDingService {
                     .setRoleId(smanager.getId())
                     .setRoleName(smanager.getRolename())
                     .setDingdingUserid(authUserId)
+                    .setName(authUserId)//新版，钉钉应用市场的用userId作name
                     .setColor(ColorUtil.randomColor())
                     .setCompanyId(company.getId());
 
@@ -1651,7 +1652,7 @@ public class DingDingServiceImpl implements DingDingService {
                     .setRoleId(defaultRole.getId())
                     .setRoleName(defaultRole.getRolename())
                     .setCompanyId(dingding.getCompanyId())
-                    .setName(userJson.getString("name"))
+                    .setName(dingding.getContactNeedTranslate() == 0?userJson.getString("name"):dingdingUserid)
                     .setDingdingUserid(dingdingUserid)
                     .setDingdingUnionid(userJson.getString("unionid"))
                     .setColor(ColorUtil.randomColor());
@@ -1720,7 +1721,11 @@ public class DingDingServiceImpl implements DingDingService {
                 TempDuser duser = new TempDuser();
                 duser.setDingdingUserid(dingdingUserid);
                 //用userId作为name,方便系统内部处理
-                duser.setName(dingdingUserid);
+                if (userJson.getString("name") == null) {
+                    duser.setName(dingdingUserid);
+                } else {
+                    duser.setName(userJson.getString("name"));
+                }
                 duser.setDdDeptid(ddDeptId);
                 duser.setCorpid(corpid);
                 duser.setJobNumber(userJson.getString("job_number"));