chenr преди 6 месеца
родител
ревизия
be494f434d

+ 1 - 2
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -1091,7 +1091,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             //------初始编号信息------
             this.initBuildNumber(dto);
         }
-        //this.saveOrUpdate(dto);
+        this.saveOrUpdate(dto);
         if (ObjectUtil.isNotEmpty(dto.getId())) {
             //------获取最新试验记录------
             TrialSelfInspectionRecord obj = baseMapper.selectById(dto.getId());
@@ -1120,7 +1120,6 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             //修改项目节点基础信息
             jdbcTemplate.update("update u_entrust_info set sample_status=4 where id ='"+dto.getEntrustId()+"'");
         }
-
         return dto.getId().toString();
     }
 

+ 4 - 2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1648,8 +1648,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                     List<String> names = new ArrayList<>();
                     for (String str : fileUserIdAndNames) {
                         String[] strArr = str.split("-");
-                        if (!names.contains(strArr[1])) {
-                            names.add(strArr[1]);
+                        if(strArr.length>1){
+                            if (!names.contains(strArr[1])) {
+                                names.add(strArr[1]);
+                            }
                         }
                     }
                     vor.setFileUserIdAndName(String.join(",", names));