LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 组织机构导入提示语

Browse Source
This commit is contained in:
lijiarao
2021-10-28 11:08:39 +08:00
parent e9aca4d4d7
commit 12a0f68e70
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+29 -25
View File
@@ -421,30 +421,32 @@ public class SysDepartController {
List<String> errorMessage = new ArrayList<>(); List<String> errorMessage = new ArrayList<>();
int num = 0; int num = 0;
for (SysDepartExcel sysDepart : listSysDeparts) { for (SysDepartExcel sysDepart : listSysDeparts) {
String orgCode = sysDepart.getOrgCode(); int lineNumber = num +1;
if(orgCode.length() > codeLength) { List<String> errorList = ValidUtil.validateReturnList(sysDepart);
String parentCode = orgCode.substring(0, orgCode.length()-codeLength); if (!errorList.isEmpty()){
QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>(); errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
queryWrapper.eq("org_code", parentCode); }
SysDepart parentDept = sysDepartService.getOne(queryWrapper); if (errorMessage.isEmpty()){
if(parentDept != null) { String orgCode = sysDepart.getOrgCode();
sysDepart.setParentId(parentDept.getId()); if(orgCode.length() > codeLength) {
} else { String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
queryWrapper.eq("org_code", parentCode);
SysDepart parentDept = sysDepartService.getOne(queryWrapper);
if(parentDept != null) {
sysDepart.setParentId(parentDept.getId());
} else {
sysDepart.setParentId("");
}
}else{
sysDepart.setParentId(""); sysDepart.setParentId("");
} }
}else{ //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
sysDepart.setParentId(""); sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
//update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
} }
//update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
//update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
int lineNumber = num +1;
try { try {
List<String> errorList = ValidUtil.validateReturnList(sysDepart);
if (!errorList.isEmpty()){
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
}
LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName()); wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName());
if (sysDepartService.count(wrapper) > 0) { if (sysDepartService.count(wrapper) > 0) {
@@ -467,11 +469,13 @@ public class SysDepartController {
} }
num++; num++;
} }
//清空部门缓存 if (errorMessage.isEmpty()){
Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*"); //清空部门缓存
Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
redisTemplate.delete(keys3); Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
redisTemplate.delete(keys4); redisTemplate.delete(keys3);
redisTemplate.delete(keys4);
}
return ImportExcelUtil.importReturnRes(errorMessage.size(), errorMessage); return ImportExcelUtil.importReturnRes(errorMessage.size(), errorMessage);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
+1
View File
@@ -34,6 +34,7 @@ public class SysDepartExcel {
/**机构编码*/ /**机构编码*/
@Excel(name="机构编码",width=15,orderNum = "2") @Excel(name="机构编码",width=15,orderNum = "2")
@NotBlank(message = "机构编码不能为空")
private String orgCode; private String orgCode;
/**手机号*/ /**手机号*/
@Excel(name="手机号",width=15,orderNum = "5") @Excel(name="手机号",width=15,orderNum = "5")