anderx il y a 2 ans
Parent
commit
e354c10e00

+ 12 - 10
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -122,6 +122,17 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                 ProjectTask projectTask = projectTaskMapper.selectByPrimaryKey(p.getId());
                 if (StringUtils.isNull(projectTask)){
                     BeanValidators.validateWithException(validator, p);
+
+                    if(StringUtils.isNotBlank(p.getAdminName())) {
+                        SysUser sysUser = userMapper.selectByNikeName(p.getAdminName());
+                        if (sysUser == null) {
+                            throw new ServiceException(String.format("负责人[%s]不存在", p.getAdminName()));
+                        }
+                        p.setAid(sysUser.getUserId());
+                        p.setAdminName(sysUser.getNickName());
+                    }
+                    p.setProjectStatus(0);
+                    projectTaskMapper.insertSelective(p);
                     if(StringUtils.isNotBlank(p.getStaffName())) {
                         String[] split = p.getStaffName().split(",");
                         for (String s : split) {
@@ -136,18 +147,9 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                             projectStaffMapper.insertSelective(newPs);
                         }
                     }
-                    if(StringUtils.isNotBlank(p.getAdminName())) {
-                        SysUser sysUser = userMapper.selectByNikeName(p.getAdminName());
-                        if (sysUser == null) {
-                            throw new ServiceException(String.format("负责人[%s]不存在", p.getAdminName()));
-                        }
-                        p.setAid(sysUser.getUserId());
-                        p.setAdminName(sysUser.getNickName());
-                    }
-                    projectTaskMapper.insertSelective(p);
                     projectTaskMapper.updateStaffName(p.getId());
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、项目: " + projectTask.getName() + " 导入成功");
+                    successMsg.append("<br/>" + successNum + "、项目: " + p.getName() + " 导入成功");
                 }else if (updateSupport){
                     BeanValidators.validateWithException(validator, p);
                     if(StringUtils.isNotBlank(p.getStaffName())) {