Merge remote-tracking branch 'origin/master'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.CommonConstant;
@@ -18,6 +20,8 @@ import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.quartz.service.IQuartzJobService;
 import org.jeecg.modules.system.entity.SysPosition;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysPositionService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -51,7 +55,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/sys/position")
 public class SysPositionController {
-
+    @Autowired
+    private SysDepartMapper sysDepartMapper;
     @Autowired
     private ISysPositionService sysPositionService;
 
@@ -287,7 +292,22 @@ public class SysPositionController {
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
-                List<Object>  listSysPositions = ExcelImportUtil.importExcel(file.getInputStream(), SysPosition.class, params);
+                List<Object>  listSysPositions1 = ExcelImportUtil.importExcel(file.getInputStream(), SysPosition.class, params);
+                List<Object>  listSysPositions = new ArrayList<>();
+                ObjectMapper objectMapper = new ObjectMapper();
+
+                for(Object o:listSysPositions1){
+                    SysPosition en = new SysPosition();
+                    en = objectMapper.convertValue(o,SysPosition.class);
+                    if(StringUtils.isNotBlank(en.getDeptName())){
+                        String id = sysDepartMapper.getDepartLis(en.getDeptName());
+                        if(StringUtils.isNotBlank(id)){
+                            en.setDeptId(id);
+                        }
+                    }
+                    listSysPositions.add(en);
+                }
+
                 List<String> list = ImportExcelUtil.importDateSave(listSysPositions, ISysPositionService.class, errorMessage,CommonConstant.SQL_INDEX_UNIQ_CODE);
                 errorLines+=list.size();
                 successLines+=(listSysPositions.size()-errorLines);

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -144,10 +144,10 @@ spring:
           password: 123@qaz
           # 多数据源配置
           #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/geke?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
+          driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
     database: 0