Browse Source

提交用户提交离职资料出现多个问题

hxl13994548489 2 năm trước cách đây
mục cha
commit
199f99b9ab

+ 9 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -21,6 +21,7 @@ import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
 import com.ydtech.modules.admin.model.dto.QuUserNumDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.po.KztDataPermission;
 import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
 import com.ydtech.modules.admin.model.vo.*;
@@ -617,7 +618,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
                 sysUserRoleService.save(userRole);
             } else {
-                userId = "";
+                userId = sysUser.getId();
                 updateById(sysUser);
             }
         }else{
@@ -757,7 +758,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
                 sysUserRoleService.save(userRole);
             } else {
-                userId = "";
+                userId = sysUser.getId();
                 updateById(sysUser);
             }
         }else{
@@ -1563,6 +1564,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         this.updateById(byId);
 
         //添加离职证明
+        //判斷是否存在先刪除   add by hxl
+        LambdaQueryWrapper<EsmUserImage> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(EsmUserImage::getUserId, sysUserVO.getSysUser().getId());
+        lqw.eq(EsmUserImage::getType, InsuranceImageEnum.LZ_01.getCode());
+        esmUserImageService.getBaseMapper().delete(lqw);
+
         EsmUserImageVo esmUserImageVo = sysUserVO.getEsmUserImageVo().get(0);
         esmUserImageVo.setType(InsuranceImageEnum.LZ_01.getCode());
         EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo, sysUserVO.getSysUser().getId());