From 286024269147dd7f62c5d3faffbdaca2011c22ac Mon Sep 17 00:00:00 2001 From: Gitea Date: Sun, 10 Nov 2024 16:14:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=83=A8=E9=97=A8org=5Fc?= =?UTF-8?q?ategory=E5=AD=97=E6=AE=B5=E6=9A=82=E6=97=B6=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/SysDepartServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 3d1ad59..001b79f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -211,7 +211,8 @@ public class SysDepartServiceImpl extends ServiceImpl Date: Sun, 10 Nov 2024 16:17:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=8F=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 1 + .../expert/controller/ExpertController.java | 41 ++++++++---------- .../modules/demo/expert/entity/ExpDepVos.java | 9 ++++ jeecgboot-vue3/src/api/sys/user.ts | 6 +++ .../system/loginmini/MiniRegisterexp.vue | 43 ++++++++++++++++++- 5 files changed, 76 insertions(+), 24 deletions(-) create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpDepVos.java 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 a9d5810..9d7ec6c 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 @@ -84,6 +84,7 @@ public class ShiroConfig { } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/expert/expert/getdepdata", "anon"); //注册的时候查询部门 filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口 filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口 filterChainDefinitionMap.put("/disciplinefieid/disciplineFieid/listcms", "anon"); //cms学科领域接口 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index d742e89..6b3d551 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -2,9 +2,6 @@ package org.jeecg.modules.demo.expert.controller; import java.util.*; import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -13,13 +10,13 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid; import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService; import org.jeecg.modules.demo.expert.entity.ExpCmsVo; +import org.jeecg.modules.demo.expert.entity.ExpDepVos; import org.jeecg.modules.demo.expert.entity.ExpdefVo; import org.jeecg.modules.demo.expert.entity.Expert; import org.jeecg.modules.demo.expert.service.IExpertService; @@ -38,24 +35,15 @@ import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysDepartService; 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; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; 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.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: 专家管理 * @Author: jeecg-boot * @Date: 2024-09-29 @@ -928,14 +916,23 @@ public class ExpertController extends JeecgController { expertService.updateById(expert); return Result.OK("驳回成功，已责令专家重新编辑!"); } - @AutoLog(value = "专家管理-公司驳回") - @ApiOperation(value="专家管理-公司驳回", notes="专家管理-公司驳回") - @RequestMapping(value = "/saveOrUpdatefimebh", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result saveOrUpdatefimebh(@RequestBody Expert expert) { - expert.setCompopen("3"); - - expertService.updateById(expert); - return Result.OK("编辑成功!"); + @AutoLog(value = "查找法人部门") + @ApiOperation(value="查找法人部门", notes="查找法人部门") + @GetMapping(value = "/getdepdata") + public Result< List> getdepdata() { + List departs = sysDepartService.list(); + List departstemp = departs.stream() + .filter(depart -> depart.getDepartNameAbbr() != null && !depart.getDepartNameAbbr().isEmpty()) + .collect(Collectors.toList()); + List expDepVos =new ArrayList<>(); + + for (SysDepart depart : departstemp) { + ExpDepVos expDepVo =new ExpDepVos(); + expDepVo.setDepid(depart.getId()); + expDepVo.setDepname(depart.getDepartName()); + expDepVos.add(expDepVo); + } + return Result.OK(expDepVos); } } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpDepVos.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpDepVos.java new file mode 100644 index 0000000..9ada59d --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpDepVos.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.demo.expert.entity; + +import lombok.Data; + +@Data +public class ExpDepVos { + 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 a57f216..1e64eec 100644 --- a/jeecgboot-vue3/src/api/sys/user.ts +++ b/jeecgboot-vue3/src/api/sys/user.ts @@ -49,6 +49,7 @@ enum Api { getLoginQrcode = '/sys/getLoginQrcode', //监控二维码扫描状态 getQrcodeToken = '/sys/getQrcodeToken', + getdepdataapi= '/expert/expert/getdepdata', } /** @@ -239,3 +240,8 @@ 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 }); +} diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegisterexp.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegisterexp.vue index 24b64d0..5839b1d 100644 --- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegisterexp.vue +++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegisterexp.vue @@ -66,8 +66,28 @@
- + + + + + + {{ selectValue }} +
+ + + + + + + + + + +
@@ -115,7 +135,7 @@