diff --git a/admin-hanhai-vue/.env b/admin-hanhai-vue/.env
index e75392c..15710b5 100644
--- a/admin-hanhai-vue/.env
+++ b/admin-hanhai-vue/.env
@@ -1,5 +1,5 @@
NODE_ENV=production
-VUE_APP_PLATFORM_NAME=用工小程序
+VUE_APP_PLATFORM_NAME=铝材交易后台管理系统
# 开启单点登录
VUE_APP_SSO=false
# 开启微应用模式
diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development
index c610a8c..dff2c2b 100644
--- a/admin-hanhai-vue/.env.development
+++ b/admin-hanhai-vue/.env.development
@@ -1,5 +1,5 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8000/employ-admin/
+VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production
index 084c8ef..d24a478 100644
--- a/admin-hanhai-vue/.env.production
+++ b/admin-hanhai-vue/.env.production
@@ -1,4 +1,4 @@
NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8000/employ-admin/
+VUE_APP_API_BASE_URL=https://aluminium-prod.hhlm1688.com/aluminium-api/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/admin-hanhai-vue/public/img.png b/admin-hanhai-vue/public/img.png
deleted file mode 100644
index 30c5357..0000000
Binary files a/admin-hanhai-vue/public/img.png and /dev/null differ
diff --git a/admin-hanhai-vue/public/index.html b/admin-hanhai-vue/public/index.html
index c5e66c0..931da2a 100644
--- a/admin-hanhai-vue/public/index.html
+++ b/admin-hanhai-vue/public/index.html
@@ -5,8 +5,8 @@
-
用工小程序
-
+ 铝材交易后台管理系统
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/banner/modules/WebBannerForm.vue b/admin-hanhai-vue/src/views/banner/modules/WebBannerForm.vue
new file mode 100644
index 0000000..373e2c6
--- /dev/null
+++ b/admin-hanhai-vue/src/views/banner/modules/WebBannerForm.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.Style#Drawer.vue
new file mode 100644
index 0000000..509370f
--- /dev/null
+++ b/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.vue b/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.vue
new file mode 100644
index 0000000..5092021
--- /dev/null
+++ b/admin-hanhai-vue/src/views/banner/modules/WebBannerModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/customs/TbCustomsList.vue b/admin-hanhai-vue/src/views/customs/TbCustomsList.vue
new file mode 100644
index 0000000..6d56a6f
--- /dev/null
+++ b/admin-hanhai-vue/src/views/customs/TbCustomsList.vue
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/customs/modules/TbCustomsForm.vue b/admin-hanhai-vue/src/views/customs/modules/TbCustomsForm.vue
new file mode 100644
index 0000000..fbff815
--- /dev/null
+++ b/admin-hanhai-vue/src/views/customs/modules/TbCustomsForm.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.Style#Drawer.vue
new file mode 100644
index 0000000..8d62fda
--- /dev/null
+++ b/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.vue b/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.vue
new file mode 100644
index 0000000..84a7266
--- /dev/null
+++ b/admin-hanhai-vue/src/views/customs/modules/TbCustomsModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/industry/TbIndustryList.vue b/admin-hanhai-vue/src/views/industry/TbIndustryList.vue
new file mode 100644
index 0000000..4d1a79b
--- /dev/null
+++ b/admin-hanhai-vue/src/views/industry/TbIndustryList.vue
@@ -0,0 +1,358 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 添加下级
+
+
+ handleDeleteNode(record.id)" placement="topLeft">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/industry/modules/TbIndustryModal.vue b/admin-hanhai-vue/src/views/industry/modules/TbIndustryModal.vue
new file mode 100644
index 0000000..e313753
--- /dev/null
+++ b/admin-hanhai-vue/src/views/industry/modules/TbIndustryModal.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/product/TbProductList.vue b/admin-hanhai-vue/src/views/product/TbProductList.vue
new file mode 100644
index 0000000..63af222
--- /dev/null
+++ b/admin-hanhai-vue/src/views/product/TbProductList.vue
@@ -0,0 +1,263 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue b/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue
new file mode 100644
index 0000000..5e1165d
--- /dev/null
+++ b/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/product/modules/TbProductModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/product/modules/TbProductModal.Style#Drawer.vue
new file mode 100644
index 0000000..b2132b3
--- /dev/null
+++ b/admin-hanhai-vue/src/views/product/modules/TbProductModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/product/modules/TbProductModal.vue b/admin-hanhai-vue/src/views/product/modules/TbProductModal.vue
new file mode 100644
index 0000000..be72558
--- /dev/null
+++ b/admin-hanhai-vue/src/views/product/modules/TbProductModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
new file mode 100644
index 0000000..850dc56
--- /dev/null
+++ b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue
new file mode 100644
index 0000000..49f986a
--- /dev/null
+++ b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.Style#Drawer.vue
new file mode 100644
index 0000000..6ab7406
--- /dev/null
+++ b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.vue b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.vue
new file mode 100644
index 0000000..0f876ea
--- /dev/null
+++ b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue b/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
new file mode 100644
index 0000000..7b69036
--- /dev/null
+++ b/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
new file mode 100644
index 0000000..7af81fa
--- /dev/null
+++ b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.Style#Drawer.vue
new file mode 100644
index 0000000..1fb1e0e
--- /dev/null
+++ b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.vue b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.vue
new file mode 100644
index 0000000..0b9a03e
--- /dev/null
+++ b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/tbConf/TbConfList.vue b/admin-hanhai-vue/src/views/tbConf/TbConfList.vue
new file mode 100644
index 0000000..79a4ee5
--- /dev/null
+++ b/admin-hanhai-vue/src/views/tbConf/TbConfList.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue
new file mode 100644
index 0000000..6c09697
--- /dev/null
+++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue
new file mode 100644
index 0000000..c015084
--- /dev/null
+++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue
new file mode 100644
index 0000000..b56d67b
--- /dev/null
+++ b/admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue b/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
new file mode 100644
index 0000000..6469cd5
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
new file mode 100644
index 0000000..c3bb940
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.Style#Drawer.vue
new file mode 100644
index 0000000..8142cb1
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.vue b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.vue
new file mode 100644
index 0000000..9ac4966
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
index 83cecf2..913b519 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -68,7 +68,7 @@ public class Swagger2Config implements WebMvcConfigurer {
.apiInfo(apiInfo())
.select()
//此包路径下的类,才生成接口文档
- .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.api"))
+ .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.userCode"))
//加了ApiOperation注解的类,才生成接口文档
.apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
new file mode 100644
index 0000000..d626c42
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
@@ -0,0 +1,155 @@
+package org.jeecg.modules.userRole.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.userRole.entity.TbUserRole;
+import org.jeecg.modules.userRole.service.ITbUserRoleService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/userRole/tbUserRole")
+@Slf4j
+public class TbUserRoleController extends JeecgController {
+ @Autowired
+ private ITbUserRoleService tbUserRoleService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param tbUserRole
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "角色表-分页列表查询")
+ @ApiOperation(value="角色表-分页列表查询", notes="角色表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(TbUserRole tbUserRole,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = tbUserRoleService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param tbUserRole
+ * @return
+ */
+ @AutoLog(value = "角色表-添加")
+ @ApiOperation(value="角色表-添加", notes="角色表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody TbUserRole tbUserRole) {
+ tbUserRoleService.save(tbUserRole);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param tbUserRole
+ * @return
+ */
+ @AutoLog(value = "角色表-编辑")
+ @ApiOperation(value="角色表-编辑", notes="角色表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody TbUserRole tbUserRole) {
+ tbUserRoleService.updateById(tbUserRole);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "角色表-通过id删除")
+ @ApiOperation(value="角色表-通过id删除", notes="角色表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ tbUserRoleService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "角色表-批量删除")
+ @ApiOperation(value="角色表-批量删除", notes="角色表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.tbUserRoleService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "角色表-通过id查询")
+ @ApiOperation(value="角色表-通过id查询", notes="角色表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ TbUserRole tbUserRole = tbUserRoleService.getById(id);
+ if(tbUserRole==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(tbUserRole);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param tbUserRole
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, TbUserRole tbUserRole) {
+ return super.exportXls(request, tbUserRole, TbUserRole.class, "角色表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, TbUserRole.class);
+ }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
new file mode 100644
index 0000000..8e7fd9a
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
@@ -0,0 +1,111 @@
+package org.jeecg.modules.userRole.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_user_role")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_user_role对象", description="角色表")
+public class TbUserRole implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**用户id*/
+ @Excel(name = "用户id", width = 15)
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+ /**角色信息 用人方企业 1 用人方个人 0*/
+ @Excel(name = "角色信息 用人方企业 1 用人方个人 0", width = 15, dicCode = "user_role")
+ @Dict(dicCode = "user_role")
+ @ApiModelProperty(value = "用人方企业 1 用人方个人 0")
+ private Integer role;
+ /**用户名*/
+ @Excel(name = "用户名", width = 15)
+ @ApiModelProperty(value = "用户名")
+ private String userName;
+ /**行业*/
+ @Excel(name = "行业", width = 15)
+ @ApiModelProperty(value = "行业")
+ private String industry;
+ /**公司名称*/
+ @Excel(name = "公司名称", width = 15)
+ @ApiModelProperty(value = "公司名称")
+ private String companyName;
+ /**税收编码*/
+ @Excel(name = "税收编码", width = 15)
+ @ApiModelProperty(value = "税收编码")
+ private String taxCode;
+ /**公司地址*/
+ @Excel(name = "公司地址", width = 15)
+ @ApiModelProperty(value = "公司地址")
+ private String address;
+ /**公司账号*/
+ @Excel(name = "公司账号", width = 15)
+ @ApiModelProperty(value = "公司账号")
+ private String bankAccount;
+ /**电话*/
+ @Excel(name = "电话", width = 15)
+ @ApiModelProperty(value = "电话")
+ private String phone;
+ /**开户行*/
+ @Excel(name = "开户行", width = 15)
+ @ApiModelProperty(value = "开户行")
+ private String bankNama;
+ /**营业执照上传*/
+ @Excel(name = "营业执照上传", width = 15)
+ @ApiModelProperty(value = "营业执照上传")
+ private String businessLicense;
+ /**基本户信息照片上传*/
+ @Excel(name = "基本户信息照片上传", width = 15)
+ @ApiModelProperty(value = "基本户信息照片上传")
+ private String basicAccount;
+ /**收款银行照片上传*/
+ @Excel(name = "收款银行照片上传", width = 15)
+ @ApiModelProperty(value = "收款银行照片上传")
+ private String bankInfo;
+ /**审核状态 0审核中 1 审核通过 2审核未通过*/
+ @Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status")
+ @Dict(dicCode = "audit_status")
+ @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过")
+ private Integer auditStatus;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private String sysOrgCode;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
new file mode 100644
index 0000000..860e826
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.userRole.mapper;
+
+import org.jeecg.modules.userRole.entity.TbUserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+public interface TbUserRoleMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/xml/TbUserRoleMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/xml/TbUserRoleMapper.xml
new file mode 100644
index 0000000..416449a
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/xml/TbUserRoleMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
new file mode 100644
index 0000000..58f7f24
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.userRole.service;
+
+import org.jeecg.modules.userRole.entity.TbUserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+public interface ITbUserRoleService extends IService {
+
+ //获取首页基础信息
+ Map getRoleInfo(String userId);
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
new file mode 100644
index 0000000..21a08cc
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
@@ -0,0 +1,45 @@
+package org.jeecg.modules.userRole.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.modules.userRole.entity.TbUserRole;
+import org.jeecg.modules.userRole.mapper.TbUserRoleMapper;
+import org.jeecg.modules.userRole.service.ITbUserRoleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+@Service
+public class TbUserRoleServiceImpl extends ServiceImpl implements ITbUserRoleService {
+
+
+ @Override
+ public Map getRoleInfo(String userId) {
+
+ LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>();
+ queryWrapper1.eq(TbUserRole::getUserId, userId).
+ eq(TbUserRole::getRole, 0).eq(TbUserRole::getAuditStatus, 1);
+ TbUserRole boss = this.getOne(queryWrapper1);
+ LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>();
+ queryWrapper2.eq(TbUserRole::getUserId, userId).
+ eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1);
+ TbUserRole company = this.getOne(queryWrapper2);
+ Map map = new HashMap<>();
+// 返回用人方个人身份信息
+ map.put("boss", boss);
+ // 返回用人方企业身份信息
+ map.put("company", company);
+ return map;
+
+ }
+
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
new file mode 100644
index 0000000..c602242
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
new file mode 100644
index 0000000..343863d
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.Style#Drawer.vue
new file mode 100644
index 0000000..8142cb1
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.vue
new file mode 100644
index 0000000..9ac4966
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.api.ts
new file mode 100644
index 0000000..37d277d
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/userRole/tbUserRole/list',
+ save='/userRole/tbUserRole/add',
+ edit='/userRole/tbUserRole/edit',
+ deleteOne = '/userRole/tbUserRole/delete',
+ deleteBatch = '/userRole/tbUserRole/deleteBatch',
+ importExcel = '/userRole/tbUserRole/importExcel',
+ exportXls = '/userRole/tbUserRole/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
new file mode 100644
index 0000000..540f7b4
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
@@ -0,0 +1,184 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '角色信息 1供应商 2采购商',
+ align:"center",
+ dataIndex: 'role_dictText'
+ },
+ {
+ title: '用户名',
+ align:"center",
+ dataIndex: 'userName'
+ },
+ {
+ title: '公司名称',
+ align:"center",
+ dataIndex: 'companyName'
+ },
+ {
+ title: '税收编码',
+ align:"center",
+ dataIndex: 'taxCode'
+ },
+ {
+ title: '公司地址',
+ align:"center",
+ dataIndex: 'address'
+ },
+ {
+ title: '公司账号',
+ align:"center",
+ dataIndex: 'bankAccount'
+ },
+ {
+ title: '电话',
+ align:"center",
+ dataIndex: 'phone'
+ },
+ {
+ title: '开户行',
+ align:"center",
+ dataIndex: 'bankNama'
+ },
+ {
+ title: '营业执照上传',
+ align:"center",
+ dataIndex: 'businessLicense',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '基本户信息照片上传',
+ align:"center",
+ dataIndex: 'basicAccount',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '收款银行照片上传',
+ align:"center",
+ dataIndex: 'bankInfo',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '审核状态 0审核中 1 审核通过 2审核未通过',
+ align:"center",
+ dataIndex: 'auditStatus_dictText'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: "角色信息 1供应商 2采购商",
+ field: "role",
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"user_role"
+ },
+ colProps: {span: 6},
+ },
+ {
+ label: "用户名",
+ field: "userName",
+ component: 'Input',
+ colProps: {span: 6},
+ },
+ {
+ label: "公司名称",
+ field: "companyName",
+ component: 'Input',
+ colProps: {span: 6},
+ },
+ {
+ label: "电话",
+ field: "phone",
+ component: 'Input',
+ colProps: {span: 6},
+ },
+ {
+ label: "审核状态 0审核中 1 审核通过 2审核未通过",
+ field: "auditStatus",
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"audit_status"
+ },
+ colProps: {span: 6},
+ },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '角色信息 1供应商 2采购商',
+ field: 'role',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"user_role"
+ },
+ },
+ {
+ label: '用户名',
+ field: 'userName',
+ component: 'Input',
+ },
+ {
+ label: '公司名称',
+ field: 'companyName',
+ component: 'Input',
+ },
+ {
+ label: '税收编码',
+ field: 'taxCode',
+ component: 'Input',
+ },
+ {
+ label: '公司地址',
+ field: 'address',
+ component: 'Input',
+ },
+ {
+ label: '公司账号',
+ field: 'bankAccount',
+ component: 'Input',
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input',
+ },
+ {
+ label: '开户行',
+ field: 'bankNama',
+ component: 'Input',
+ },
+ {
+ label: '营业执照上传',
+ field: 'businessLicense',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '基本户信息照片上传',
+ field: 'basicAccount',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '收款银行照片上传',
+ field: 'bankInfo',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '审核状态 0审核中 1 审核通过 2审核未通过',
+ field: 'auditStatus',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"audit_status"
+ },
+ },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
new file mode 100644
index 0000000..9c06043
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/components/TbUserRoleModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/components/TbUserRoleModal.vue
new file mode 100644
index 0000000..3a75d48
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/components/TbUserRoleModal.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java
new file mode 100644
index 0000000..0901b80
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java
@@ -0,0 +1,79 @@
+package org.jeecg.modules.postBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 角色表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-16
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="选择身份对象", description="选择身份对象")
+public class ReqUserRole implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+
+
+ /**用人方企业 1 用人方个人 0*/
+ @Excel(name = "用人方企业 1 用人方个人 0", width = 15, dicCode = "user_role")
+ @Dict(dicCode = "user_role")
+ @ApiModelProperty(value = "用人方企业 1 用人方个人 0")
+ private Integer role;
+ /**用户名*/
+ @Excel(name = "用户名", width = 15)
+ @ApiModelProperty(value = "用户名")
+ private String userName;
+ @ApiModelProperty(value = "行业")
+ private String industry;
+// @ApiModelProperty(value = "密码")
+// private String password;
+ /**公司名称*/
+ @Excel(name = "公司名称", width = 15)
+ @ApiModelProperty(value = "公司名称")
+ private String companyName;
+// /**税收编码*/
+// @Excel(name = "税收编码", width = 15)
+// @ApiModelProperty(value = "税收编码")
+// private String taxCode;
+ /**公司地址*/
+ @Excel(name = "公司地址", width = 15)
+ @ApiModelProperty(value = "公司地址")
+ private String address;
+// /**公司账号*/
+// @Excel(name = "公司账号", width = 15)
+// @ApiModelProperty(value = "公司账号")
+// private String bankAccount;
+// /**电话*/
+// @Excel(name = "电话", width = 15)
+// @ApiModelProperty(value = "电话")
+// private String phone;
+// /**开户行*/
+// @Excel(name = "开户行", width = 15)
+// @ApiModelProperty(value = "开户行")
+// private String bankNama;
+ /**营业执照上传*/
+ @Excel(name = "营业执照上传", width = 15)
+ @ApiModelProperty(value = "营业执照上传")
+ private String businessLicense;
+// /**基本户信息照片上传*/
+// @Excel(name = "基本户信息照片上传", width = 15)
+// @ApiModelProperty(value = "基本户信息照片上传")
+// private String basicAccount;
+// /**收款银行照片上传*/
+// @Excel(name = "收款银行照片上传", width = 15)
+// @ApiModelProperty(value = "收款银行照片上传")
+// private String bankInfo;
+// /**审核状态 0审核中 1 审核通过 2审核未通过*/
+// @Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status")
+// @Dict(dicCode = "audit_status")
+// @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过")
+// private Integer auditStatus;
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/UserController.java
deleted file mode 100644
index c5c995f..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/UserController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jeecg.modules.user.controller;
-
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.bean.LoginReq;
-import org.jeecg.modules.user.service.AppletLoginService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-
-/**
- * 服务化 system模块 对外接口请求类
- * @author: jeecg-boot
- */
-@Slf4j
-@RestController
-@RequestMapping("/user/")
-public class UserController {
-
- @Resource
- private AppletLoginService appletLoginService;
-
-
- //小程序授权登录
- @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口")
- @GetMapping("/login")
- public Result> login(LoginReq loginReq){
- return appletLoginService.appletLogin(loginReq);
- }
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/IndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java
similarity index 84%
rename from jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/IndexController.java
rename to jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java
index b3126eb..f92b76e 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/controller/IndexController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java
@@ -1,30 +1,23 @@
-package org.jeecg.modules.user.controller;
+package org.jeecg.modules.userCode.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.xkcoding.http.HttpUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.config.shiro.ShiroRealm;
-import org.jeecg.modules.user.service.IndexService;
+import org.jeecg.modules.userCode.service.IndexService;
import org.jeecg.modules.banner.entity.WebBanner;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.postBean.SuggestReq;
import org.jeecg.modules.tbSuggest.entity.TbSuggest;
import org.jeecg.modules.tbSuggest.service.ITbSuggestService;
-import org.jeecg.modules.utils.ValidateTool;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* @Author scott
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java
new file mode 100644
index 0000000..db0d18a
--- /dev/null
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java
@@ -0,0 +1,51 @@
+package org.jeecg.modules.userCode.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.bean.LoginReq;
+import org.jeecg.modules.postBean.ReqUserRole;
+import org.jeecg.modules.userCode.service.AppletLoginService;
+import org.jeecg.modules.utils.ValidateTool;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 服务化 system模块 对外接口请求类
+ *
+ * @author: jeecg-boot
+ */
+@Slf4j
+@RestController
+@RequestMapping("/user/")
+@Api(tags = "登陆选择身份等接口")
+public class UserController {
+
+ @Resource
+ private AppletLoginService appletLoginService;
+
+
+ //小程序授权登录
+ @ApiOperation(value = "小程序-登录接口", notes = "小程序-登录接口")
+ @GetMapping("/login")
+ public Result> login(LoginReq loginReq) {
+ return appletLoginService.appletLogin(loginReq);
+ }
+
+
+ @ApiOperation(value = "选择身份")
+ @RequestMapping(value = "/role", method = RequestMethod.POST)
+ public Result role(@RequestBody ReqUserRole reqUserRole, @RequestHeader("X-Access-Token") String token) {
+ if (ValidateTool.isNull(reqUserRole)) {
+ return Result.error("参数错误");
+ }
+
+ return appletLoginService.role(reqUserRole,token);
+ }
+
+
+}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/service/AppletLoginService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java
similarity index 56%
rename from jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/service/AppletLoginService.java
rename to jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java
index 041a9eb..e5968e7 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/user/service/AppletLoginService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java
@@ -1,15 +1,19 @@
-package org.jeecg.modules.user.service;
+package org.jeecg.modules.userCode.service;
+import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.bean.LoginReq;
+import org.jeecg.modules.postBean.ReqUserRole;
public interface AppletLoginService {
/**
* 微信小程序登录接口
+ *
* @param loginReq
* @return
*/
Result