修复工作记录报错

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -17,6 +17,7 @@ import com.usky.iot.service.vo.ProjectWorkTimeVO;
 import com.usky.iot.service.vo.UserWorkTimeVO;
 import com.usky.iot.service.vo.WorkHoursStatisticsVO;
 import com.usky.system.domain.SysUser;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -176,28 +177,34 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
                     d.setCreateBy(e.getNickName());
                 }
             }
-            List<Long> ids = Optional.ofNullable(d.getCcTo())
-                    .map(ccTo -> Arrays.stream(ccTo.split(","))
-                            .map(Long::parseLong)
-                            .collect(Collectors.toList()))
-                    .orElse(Collections.emptyList());
-            List<SysUser> nickNameList = nickNames(ids);
-            StringBuilder ccToBuilder = new StringBuilder();
-            Set<Long> addedUserIds = new HashSet<>();
-            for (Long id : ids) {
-                for (SysUser user : nickNameList) {
-                    if (user.getUserId().equals(id) && !addedUserIds.contains(id)) {
-                        if (ccToBuilder.length() > 0) {
-                            ccToBuilder.append(", ");
+            List<Long> ids = null;
+            if (!d.getCcTo().isEmpty()) {
+                ids = Optional.ofNullable(d.getCcTo())
+                        .map(ccTo -> Arrays.stream(ccTo.split(","))
+                                .map(Long::parseLong)
+                                .collect(Collectors.toList()))
+                        .orElse(Collections.emptyList());
+            }
+            List<SysUser> nickNameList = null;
+            if (CollectionUtils.isNotEmpty(ids)) {
+                nickNameList = nickNames(ids);
+                StringBuilder ccToBuilder = new StringBuilder();
+                Set<Long> addedUserIds = new HashSet<>();
+                for (Long id : ids) {
+                    for (SysUser user : nickNameList) {
+                        if (user.getUserId().equals(id) && !addedUserIds.contains(id)) {
+                            if (ccToBuilder.length() > 0) {
+                                ccToBuilder.append(", ");
+                            }
+                            ccToBuilder.append(user.getNickName());
+                            addedUserIds.add(id);
+                            break;
                         }
-                        ccToBuilder.append(user.getNickName());
-                        addedUserIds.add(id);
-                        break;
                     }
                 }
+                String ccTo = ccToBuilder.toString();
+                d.setCcTo(ccTo);
             }
-            String ccTo = ccToBuilder.toString();
-            d.setCcTo(ccTo);
         }
         return reportList;
     }