|
|
@@ -456,14 +456,14 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
|
|
|
sysUserService.deleteByLoginName(user.getLoginName());
|
|
|
}
|
|
|
- if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
+ //if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
System.out.println("解析diy部门不一致情况原/新"+sysUser.getSysUserExt().getPostCode()+"/"+userExt.getPostCode());
|
|
|
SysUserRole role=new SysUserRole();
|
|
|
role.setUserId(sysUser.getUserId());
|
|
|
userRoleMapper.deleteUserRoleInfo(role);
|
|
|
user.setUserId(sysUser.getUserId());
|
|
|
insertUserRole(user);
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
if(!sysUser.getSysUserExt().getSalesLevel().equals("diy_level")){
|
|
|
user.setSysUserExt(userExt);
|
|
|
@@ -681,14 +681,14 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
|
|
|
sysUserService.deleteByLoginName(user.getLoginName());
|
|
|
}
|
|
|
- if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
+ //if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
log.error("解析cw部门不一致情况原/新", sysUser.getSysUserExt().getPostCode()+"/"+userExt.getPostCode());
|
|
|
SysUserRole role=new SysUserRole();
|
|
|
role.setUserId(sysUser.getUserId());
|
|
|
userRoleMapper.deleteUserRoleInfo(role);
|
|
|
user.setUserId(sysUser.getUserId());
|
|
|
insertUserRole(user);
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
if (!sysUser.getSysUserExt().getSalesLevel().equals("diy_level")) {
|
|
|
user.setSysUserExt(userExt);
|
|
|
@@ -881,14 +881,14 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
|
|
|
sysUserService.deleteByLoginName(user.getLoginName());
|
|
|
}
|
|
|
- if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
+ //if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
|
|
|
log.error("解析cw部门不一致情况原/新", sysUser.getSysUserExt().getPostCode()+"/"+userExt.getPostCode());
|
|
|
SysUserRole role=new SysUserRole();
|
|
|
role.setUserId(sysUser.getUserId());
|
|
|
userRoleMapper.deleteUserRoleInfo(role);
|
|
|
user.setUserId(sysUser.getUserId());
|
|
|
insertUserRole(user);
|
|
|
- }
|
|
|
+ // }
|
|
|
user.setSysUserExt(userExt);
|
|
|
user.setUpdateTime(new Date());
|
|
|
sysUserService.updateUserInfoAndSalesExt(user);
|