diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java index fc5e9ae0..e8c1fcd7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.controller; +import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,6 +20,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.system.entity.SysPosition; import org.jeecg.modules.system.service.ISysPositionService; +import org.jeecg.modules.system.service.ISysUserService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -39,6 +41,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 职务表 @@ -55,6 +58,9 @@ public class SysPositionController { @Autowired private ISysPositionService sysPositionService; + @Autowired + private ISysUserService userService; + /** * 分页列表查询 * @@ -98,6 +104,13 @@ public class SysPositionController { public Result add(@RequestBody SysPosition sysPosition) { Result result = new Result(); try { + //update-begin---author:wangshuai ---date:20230313 for:【QQYUN-4558】vue3职位功能调整,去掉编码和级别,可以先隐藏------------ + //编号是空的,不需要判断多租户隔离了 + if(oConvertUtils.isEmpty(sysPosition.getCode())){ + //生成职位编码10位 + sysPosition.setCode(RandomUtil.randomString(10)); + } + //update-end---author:wangshuai ---date:20230313 for:【QQYUN-4558】vue3职位功能调整,去掉编码和级别,可以先隐藏------------- sysPositionService.save(sysPosition); result.success("添加成功!"); } catch (Exception e) {