Browse Source

修复:

1.导入的时候发生调动动作,附加信息表中有数据时产生多余类别变更记录的bug
dev
wangxianzhang 4 years ago
parent
commit
5ed02f594b
  1. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

13
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@ -1211,7 +1211,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
Map<String, String> newCategories = transferedData.getNewData().getCategories();
Map<String, String> oldCategories = transferedData.getOldData().getCategories();
oldCategories.put(columnName, "0");
String oldValue = resiInfoMap.get(columnName);
if (StringUtils.isBlank(oldValue)) {
oldValue = "0";
}
oldCategories.put(columnName, oldValue);
newCategories.put(columnName, "1");
return;
}
@ -1371,8 +1376,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
*/
public void saveTransferedResiRecord(Map<String, ResiImportChangedData> transferedResis) {
Date now = new Date();
String customerId = loginUserUtil.getLoginUserCustomerId();
CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId());
for (Map.Entry<String, ResiImportChangedData> resi : transferedResis.entrySet()) {
String customerId = loginUserUtil.getLoginUserCustomerId();
String resiId = resi.getKey();
ResiImportCategoryData oldData = resi.getValue().getOldData();
@ -1478,8 +1485,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
}
}
CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId());
IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId);
// 保存 transferRecord

Loading…
Cancel
Save