bug修改

zhanghua

2023-04-14 e8a0f05f99f33fa05085536541da6bc27e66a644

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -18,7 +18,7 @@
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsRole;
import com.ycl.mapper.depart.UmsDepartMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.redis.RedisService;
@@ -150,7 +150,7 @@
    public void exportUser(HttpServletResponse response) {
        List<UmsUserDto1> umsUserDtos = adminService.userExp();
        String sheetName = "用户导出";
        EasyExcelUtils.export(response, sheetName, UmsUserDto1.class, umsUserDtos);
        EasyExcelUtils.export1(response, sheetName, UmsUserDto1.class, umsUserDtos, "用户导出");
    }

    @Resource
@@ -158,7 +158,7 @@
    @Resource
    private UmsAdminMapper umsAdminMapper;
    @Resource
    private DataDictionaryMapper dataDictionaryMapper;
    private DataDictionary2Mapper dataDictionary2Mapper;
    @Resource
    private UmsDepartMapper umsDepartMapper;
    @ApiOperation("用户导入")
@@ -206,7 +206,7 @@
                        }

                        String userType = item.getUserType();
                        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
                        DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
                        if (Objects.isNull(dataDictionary)){
                            throw new RuntimeException("用户类型不存在");
                        }else {