Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -1180,23 +1180,25 @@ public class DingDingServiceImpl implements DingDingService {
 
                 List<User> oldList = userMapper.selectList(new QueryWrapper<User>().eq("dingding_userid", dingdingUserid).eq("company_id", companyId));
                 if (oldList.size() == 0) {
-                    Integer employeeCnt = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", companyId).eq("is_active",1));
-                    Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", companyId));
-                    ContactSyncLog contactSyncLog = new ContactSyncLog();
-                    contactSyncLog.setCompanyId(companyId);
-                    if (employeeCnt + 1 > company.getStaffCountMax()){
-                        contactSyncLog.setResult(0);
-                        //contactSyncLog.setMsg("公司人员已达上限，请联系客服提高人数上限。");
-                        contactSyncLog.setMsg(MessageUtils.message("wx.employeeFull"));
-                        contactSyncLogMapper.insert(contactSyncLog);
-                    }else {
-                        System.out.println("新增钉钉用户==" + user.getName());
-                        userMapper.insert(user);
-                        contactSyncLog.setResult(1);
-                        //contactSyncLog.setMsg("同步成功");
-                        contactSyncLog.setMsg(MessageUtils.message("wx.synSuccess"));
-                        contactSyncLogMapper.insert(contactSyncLog);
-                    }
+//                    Integer employeeCnt = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", companyId).eq("is_active",1));
+//                    Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", companyId));
+//                    ContactSyncLog contactSyncLog = new ContactSyncLog();
+//                    contactSyncLog.setCompanyId(companyId);
+//                    if (employeeCnt + 1 > company.getStaffCountMax()){
+//                        contactSyncLog.setResult(0);
+//                        //contactSyncLog.setMsg("公司人员已达上限，请联系客服提高人数上限。");
+//                        contactSyncLog.setMsg(MessageUtils.message("wx.employeeFull"));
+//                        contactSyncLogMapper.insert(contactSyncLog);
+//                    }else {
+//                        System.out.println("新增钉钉用户==" + user.getName());
+//                        userMapper.insert(user);
+//                        contactSyncLog.setResult(1);
+//                        //contactSyncLog.setMsg("同步成功");
+//                        contactSyncLog.setMsg(MessageUtils.message("wx.synSuccess"));
+//                        contactSyncLogMapper.insert(contactSyncLog);
+//                    }
+                    System.out.println("新增钉钉用户==" + user.getName());
+                    userMapper.insert(user);
                 } else {
                     //可能需要更新姓名
                     User oldUser = oldList.get(0);

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -335,10 +335,13 @@
         <!-- 新增/编辑人员的Dialog -->
         <el-dialog :title="title" :visible.sync="dialogVisible" width="580px" :top="'7.5vh'">
             <div style="height: 62vh;overflow: auto;">
-              <el-form ref="form12" :model="insertForm" :rules="rules" label-width="80px">
+              <el-form ref="form12" :model="insertForm" :rules="rules" label-width="80px" v-if="user.userNameNeedTranslate != '1'">
                   <el-form-item :label="$t('lable.name')" prop="name">
                       <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="user.userNameNeedTranslate == '1'"></el-input>
                   </el-form-item>
+                  <el-form-item :label="$t('lable.name')" prop="name"  v-if="user.userNameNeedTranslate == '1'">
+                      <div><ww-open-data type='userName' :openid='insertForm.name'></ww-open-data></div>
+                  </el-form-item>
                   <el-form-item :label="$t('phone')" prop="phone">
                       <el-input v-model="insertForm.phone" :placeholder="$t('peaseenterthe')" clearable></el-input>
                   </el-form-item>