From 7d4a33b80da8c7ac3b415e4242a7f41b01e6f3f2 Mon Sep 17 00:00:00 2001 From: lijinyu <3023846734@qq.com> Date: Mon, 31 Jul 2023 15:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ModulexServiceImpl.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java index 4706413..df6607f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java @@ -668,14 +668,6 @@ public class ModulexServiceImpl extends ServiceImpl impl webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("导入失败,英文名称不能为空"); }modulex.setModuleEnName(moduleEnName); -// String moduleCode = modulexTemplate.getModuleCode(); -// if(moduleCode==null||moduleCode.length()>30){ -// message.put("isError", "true"); -// message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不能为空或者模块编码过长"); -// message.put("closeable","true"); -// webSocketUtils.sendMessage(loginUser.getId(), message); -// return Result.error("导入失败,模块编码不能为空或者模块编码过长"); -// } String modulecode = null; LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Projectx::getProjectName,projectId); @@ -690,13 +682,6 @@ public class ModulexServiceImpl extends ServiceImpl impl return Result.error("导入失败,模块对应的项目编码不存在,请完善对应项目里的项目编码后,重新导入"); } modulecode = projectCode + firstChar; -// if(!modulecode.equals(moduleCode)){ -// message.put("isError", "true"); -// message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不规范，导入失败"); -// message.put("closeable","true"); -// webSocketUtils.sendMessage(loginUser.getId(), message); -// return Result.error("模块编码不规范，导入失败"); -// } modulex.setModuleCode(modulecode); String pmDescribe = modulexTemplate.getPmDescribe(); if(StringUtils.isBlank(pmDescribe)){ @@ -715,7 +700,7 @@ public class ModulexServiceImpl extends ServiceImpl impl modulex.setManagerUsers(null); }else { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); - String[] split = managerUsers.split(","); + String[] split = managerUsers.split("\\s+|,|;|，|、"); List managerUserName= Arrays.stream(split).map(String::valueOf).collect(Collectors.toList()); sysUserLambdaQueryWrapper.in(SysUser::getUsername,managerUserName); List iSysUserServiceOne = iSysUserService.list(sysUserLambdaQueryWrapper); @@ -734,7 +719,6 @@ public class ModulexServiceImpl extends ServiceImpl impl webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("导入失败,责任人信息查询不到"); } -// String strip = org.apache.commons.lang.StringUtils.strip(list.toString(), "[]"); String s = ""; for (int j = 0; j < list.size(); j++) { s = s + list.get(j);