|
|
@@ -736,8 +736,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
UserClockDtails userClockDtails=new UserClockDtails();
|
|
|
List<LegalHolidays> legalHolidays = legalHolidaysMapper.selectAll();
|
|
|
//每一条是一个人的当月打卡
|
|
|
+ days=0;
|
|
|
for (int j = 0; j < map.size(); j++) {
|
|
|
- days=0;
|
|
|
String s = map.get(j);
|
|
|
if (j==0)userClockDtails.setName(s);
|
|
|
else if (j==1)userClockDtails.setGroupName(s.replace("\n","-").replace(" ",""));
|
|
|
@@ -992,6 +992,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
String name=null;
|
|
|
if (userList.isEmpty()){
|
|
|
SysUser sysUser = userMapper.selectDDUserId(e.getDdUserId());
|
|
|
+ if(sysUser==null) throw new ServiceException(String.format("[%s]无法匹配系统用户,请先录入导入钉钉编号", e.getName()));
|
|
|
userList.add(sysUser);
|
|
|
userid=sysUser.getUserId();
|
|
|
name=sysUser.getNickName();
|