diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 9501820..33c609e 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -86,6 +86,7 @@ public class ShiroConfig { // 配置不会被拦截的链接 顺序判断 filterChainDefinitionMap.put("/innovationvoucher/innovationVoucher/listcms", "anon"); //创新券 filterChainDefinitionMap.put("/innovationvoucher/innovationVoucher/queryByIdCms", "anon"); //创新券 + filterChainDefinitionMap.put("/innovationvoucher/innovationVoucher/listcmssy", "anon"); //创新券 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 @@ -181,6 +182,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync", "anon");//申报人注册时，选择部门列表 filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时，选择部门列表 + filterChainDefinitionMap.put("/sys/sysDepart/getDepartList4Quxian", "anon");//法人注册时，获取区县级别部门列表 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java index 27ed968..573bfba 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java @@ -100,6 +100,23 @@ public class InnovationVoucherController extends JeecgController> listcmssy(InnovationVoucher innovationVoucher, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(innovationVoucher, req.getParameterMap()); + queryWrapper.eq("state","3"); + queryWrapper.eq("use_state","1"); + queryWrapper.eq("sf_state","0"); + queryWrapper.orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = innovationVoucherService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 通过id查询 * @@ -564,8 +581,7 @@ public class InnovationVoucherController extends JeecgController> getDepartList4Quxian() { + SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, "")); + List departList4Quxian = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getParentId, sysDepart.getId()).eq(SysDepart::getDelFlag, "0")); + List quXianDepartVos = new ArrayList<>(); + Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> { + QuXianDepartVo vo = new QuXianDepartVo(); + vo.setDepName(depart.getDepartName()); + vo.setDepId(depart.getId()); + quXianDepartVos.add(vo); + }); + return Result.OK(quXianDepartVos); + } + /** * 获取某个部门的所有父级部门的ID * @@ -247,8 +264,8 @@ public class SysDepartController { } else if ("quxian_admin".equals(user.getRoleCode())) { queryWrapper.eq("parent_id", user.getOrgId()); } else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门 - queryWrapper.ne("depart_name_abbr","null"); - queryWrapper.ne("depart_name_abbr",""); + queryWrapper.ne("depart_name_abbr", "null"); + queryWrapper.ne("depart_name_abbr", ""); } return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java new file mode 100644 index 0000000..aca01e3 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.system.vo; + +import lombok.Data; + +/** + * @Description: TODO + * @Author: Z.H.C + * @CreateTime: 2024-11-12 11:20 + * @Version: 1.0 + */ + +@Data +public class QuXianDepartVo { + private String depId; + private String depName; +} diff --git a/jeecgboot-vue3/src/api/sys/user.ts b/jeecgboot-vue3/src/api/sys/user.ts index e28bcc3..76c4e1e 100644 --- a/jeecgboot-vue3/src/api/sys/user.ts +++ b/jeecgboot-vue3/src/api/sys/user.ts @@ -31,6 +31,8 @@ enum Api { userRegister4Shenbaoren = '/sys/user/userRegister4Shenbaoren', // 申报人注册接口 userRegister4Faren = '/sys/user/userRegister4Faren', + // 专家注册接口 + userRegisterexp = '/expert/expert/userRegisterexp', //校验用户接口 checkOnlyUser = '/sys/user/checkOnlyUser', //SSO登录校验 @@ -47,6 +49,8 @@ enum Api { getLoginQrcode = '/sys/getLoginQrcode', //监控二维码扫描状态 getQrcodeToken = '/sys/getQrcodeToken', + getdepdataapi= '/expert/expert/getdepdata', + getDepartList4Quxian = '/sys/sysDepart/getDepartList4Quxian', } /** @@ -127,6 +131,10 @@ export function registerFaren(params) { return defHttp.post({url: Api.userRegister4Faren, params}, {isReturnNativeResponse: true}); } +export function registerexp(params) { + return defHttp.post({url: Api.userRegisterexp, params}, {isReturnNativeResponse: true}); +} + /** * @description: 获取短信验证码 */ @@ -233,3 +241,12 @@ export async function validateCasLogin(params) { let url = Api.validateCasLogin; return defHttp.get({ url: url, params }); } + +export async function getdepdata(params) { + let url = Api.getdepdataapi; + return defHttp.get({ url: url, params }); + + +}export async function departList4Quxian(params) { + return defHttp.get({ url: Api.getDepartList4Quxian, params }); +} diff --git a/jeecgboot-vue3/src/views/declarant/declarantList.vue b/jeecgboot-vue3/src/views/declarant/declarantList.vue index a8a724d..e084a1c 100644 --- a/jeecgboot-vue3/src/views/declarant/declarantList.vue +++ b/jeecgboot-vue3/src/views/declarant/declarantList.vue @@ -4,36 +4,36 @@ @@ -69,7 +69,9 @@ import { columns, searchFormSchema } from './user.data'; import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch} from './user.api'; import {usePermission} from "/@/hooks/web/usePermission"; - + import {useUserStore} from "@/store/modules/user"; + const userStore = useUserStore(); + console.log("the current user role:",userStore.getUserInfo.roleCode); const { createMessage, createConfirm } = useMessage(); const { isDisabledAuth } = usePermission(); //注册drawer @@ -84,7 +86,6 @@ const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal(); //离职用户列表model const [registerQuitModal, { openModal: openQuitModal }] = useModal(); - // 列表页面公共参数、方法 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ designScope: 'user-list', @@ -233,7 +234,7 @@ /** * 操作栏 */ - function getTableAction(record): ActionItem[] { + /*function getTableAction(record): ActionItem[] { return [ { label: '编辑', @@ -241,31 +242,25 @@ // ifShow: () => hasPermission('system:user:edit'), }, ]; - } + }*/ /** * 下拉操作栏 */ - function getDropDownAction(record): ActionItem[] { + // function getDropDownAction(record): ActionItem[] { + function getTableAction(record): ActionItem[] { return [ { label: '详情', onClick: handleDetail.bind(null, record), }, - { + /*{ label: '密码', //auth: 'user:changepwd', onClick: handleChangePassword.bind(null, record.username), - }, - { - label: '删除', - popConfirm: { - title: '是否确认删除', - confirm: handleDelete.bind(null, record), - }, - }, + },*/ { label: '驳回', - ifShow: record.status == 1, + ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 1, popConfirm: { title: '确定驳回吗?', confirm: handleFrozen.bind(null, record, 2), @@ -273,12 +268,20 @@ }, { label: '通过', - ifShow: record.status == 2, + ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 2, popConfirm: { title: '确定通过吗?', confirm: handleFrozen.bind(null, record, 1), }, }, + { + label: '删除', + ifShow: userStore.getUserInfo.roleCode != 'shenbaoren_role', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + }, + }, // { // label: '代理人', // onClick: handleAgentSettings.bind(null, record.username), diff --git a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue index 7670268..305430b 100644 --- a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue +++ b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue @@ -196,6 +196,11 @@ confirm: handleFrozen.bind(null, record, 1), }, }, + { + ifShow: userStore.getUserInfo.roleCode =='faren_admin', + label: '编辑', + onClick: handleEdit.bind(null, record), + }, { label: '删除', ifShow: userStore.getUserInfo.roleCode !='faren_admin', diff --git a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts index 850434c..bc370c8 100644 --- a/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts +++ b/jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts @@ -92,6 +92,7 @@ export const formSchema: FormSchema[] = [ componentProps:{ dictCode:"depart_status" }, + dynamicDisabled: true, }, { label: '名称', @@ -107,6 +108,7 @@ export const formSchema: FormSchema[] = [ label: '编码', field: 'orgCode', component: 'Input', + dynamicDisabled: true, }, { label: '手机号', diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue index a6a186c..4634d7f 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue @@ -220,7 +220,7 @@ */ function getTableAction(record) { //console.log(userStore.loginInfo.departs[0].orgCategory, 'userStore'); - const oct = userStore.loginInfo.departs[0].orgCategory; + const oct = userStore.getUserInfo.roleCode; const actions = [ { label: '详情', @@ -228,7 +228,7 @@ } ]; - if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){ + if((oct==="quxian_admin"&&record.state==="1")||(record.state==="2"&&oct!=="quxian_admin")){ actions.unshift({ label: '通过', popConfirm: { @@ -237,7 +237,7 @@ } }); } - if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){ + if((oct==="quxian_admin"&&record.state==="1")||(record.state==="2"&&oct!=="quxian_admin")){ actions.unshift({ label: '驳回', popConfirm: { diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue index 2ae3b3f..c657652 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue @@ -235,7 +235,7 @@ * 操作栏 */ function getTableAction(record) { - const oct = userStore.loginInfo.departs[0].orgCategory; + const oct = userStore.getUserInfo.roleCode; const actions = [ { label: '详情', @@ -243,7 +243,7 @@ } ]; - if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){ + if((oct==="quxian_admin"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="quxian_admin")){ actions.unshift({ label: '通过', popConfirm: { @@ -252,7 +252,7 @@ } }); } - if((oct==="3"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="3")){ + if((oct==="quxian_admin"&&record.dxshSta==="1")||(record.dxshSta==="2"&&oct!=="quxian_admin")){ actions.unshift({ label: '驳回', popConfirm: { diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue index 41c4d23..b3ec210 100644 --- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue +++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue @@ -39,9 +39,15 @@ +
- + + {{ selectValue }}
@@ -118,7 +124,7 @@