Browse Source

导入修改

anderx 2 years ago
parent
commit
80326c84ae

+ 2 - 1
ruoyi-admin/src/main/resources/application-druid-dev.yml

@@ -12,7 +12,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/kede_yfdk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://localhost:3306/kede_yfdk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/yfdk20231110?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123456
             # 从库数据源

+ 3 - 2
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -172,10 +172,10 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                     successMsg.append("<br/>" + successNum + "、项目: " + p.getName() + " 导入成功");
                 }else if (updateSupport){
                     BeanValidators.validateWithException(validator, p);
+                    p.setId(projectTask.getId());
                     if(StringUtils.isNotBlank(p.getStaffName())) {
                         addStaffAndDelete( p);
                     }
-                    p.setId(projectTask.getId());
                     if (p.getAdminName()!=null){
                         SysUser sysUser = userMapper.selectByNikeName(p.getAdminName(),company);
                         if (sysUser == null) {
@@ -189,6 +189,7 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                         p.setAdminName(sysUser.getNickName());
                     }
                     projectTaskMapper.updateByPrimaryKeySelective(p);
+                    projectTaskMapper.updateStaffName(p.getId());
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、项目: " + projectTask.getName() + " 更新成功");
                 }
@@ -255,8 +256,8 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
     private void addStaffAndDelete(  ProjectTaskListOut p) {
         String[] split = p.getStaffName().split(",");
         List<ProjectStaff> projectStaffs = projectStaffMapper.selectByPid(p.getId());
-        addStaff( p, split, projectStaffs);
         deleteStaff(  split, projectStaffs);
+        addStaff( p, split, projectStaffs);
     }
 
     private void deleteStaff(  String[] split, List<ProjectStaff> projectStaffs) {

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -339,7 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select a.user_id userId, a.user_name userName,a.nick_name nickName,a.open_id openId
 		from sys_user a left join sys_user b on a.superior_id=b.user_id
 		where a.del_flag=0
-		 a.nick_name = #{nikeName}
+		and a.nick_name = #{nikeName}
 		<if test="companyId !=null and companyId != 0">
 			AND (a.dept_id = #{companyId} OR a.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{companyId}, ancestors) ))
 		</if>