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 f788be8..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 @@ -632,7 +620,7 @@ public class ExpertController extends JeecgController { if (expert.getCompopen().equals("1")) { //修改提交审核状态 expertService.handlebackbackfirm(id); - str ="驳回审核！请到编辑页面确定问题数据并填写驳回原因"; + str ="驳回审核！"; } else if (expert.getCompopen().equals("3") || expert.getCompopen().equals("2") ) { str ="已驳回或者是已通过审核"; } @@ -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/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java index ac98550..043981c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java @@ -172,7 +172,14 @@ public class ExpprojectController { if(expprojectEntity==null) { return Result.error("未找到对应数据"); } - if (expproject.getNeedexp()>=expprojectPage.getExpandproList().size()) { + int a=0; + if ( expprojectPage.getExpandproList() != null && !expprojectPage.getExpandproList().isEmpty()) { + a=expprojectPage.getExpandproList().size(); + }else { + a=0; + } + + if (expproject.getNeedexp()>=a) { expprojectService.updateMain(expproject, expprojectPage.getExpandproList()); return Result.OK("编辑成功!"); }else { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 803fd42..94d75ba 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -151,7 +151,7 @@ public class SysDepartController { /** * @description: 根据当前登录角色查询 下级部门数据 * @param: [parentId, ids, primaryKey] - * @return: org.jeecg.common.api.vo.Result> + * @return: org.jeecg.common.api.vo.Result> * @author: z.h.c * @date: 24/11/9 16:07 */ @@ -174,7 +174,7 @@ public class SysDepartController { /** * @description: 法人注册时，只显示市和县区科技局，不显示下属单位 * @param: [parentId, ids, primaryKey] - * @return: org.jeecg.common.api.vo.Result> + * @return: org.jeecg.common.api.vo.Result> * @author: z.h.c * @date: 24/11/9 16:07 */ @@ -244,8 +244,11 @@ public class SysDepartController { //单位法人角色时，只查询自己部门 if ("faren_admin".equals(user.getRoleCode())) { queryWrapper.eq("id", user.getOrgId()); - } else { // 查询下级部门 + } 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",""); } 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/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 1ac5577..1c2c097 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -166,14 +165,14 @@ public class SysUserController { /** * @description: 根据用户角色查询下属用户 * @param: [user, pageNo, pageSize, req] - * @return: org.jeecg.common.api.vo.Result> + * @return: org.jeecg.common.api.vo.Result> * @author: z.h.c * @date: 24/11/8 15:19 */ // @RequiresPermissions("system:user:listAll") @RequestMapping(value = "/listByRollCode", method = RequestMethod.GET) public Result> listByRollCode(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -192,21 +191,17 @@ public class SysUserController { */ @RequestMapping(value = "/getDeclarantList", method = RequestMethod.GET) public Result> getDeclarantList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + user.setUserType("shenbaoren"); String roleCode = loginUser.getRoleCode(); - List userIds = new LinkedList<>(); +// List userIds = new LinkedList<>(); //申报人是只查询自己 - if (StringUtils.equals(roleCode, "shenbaoren_role")) { - userIds.add(loginUser.getId()); - } else if (StringUtils.equals(roleCode, "faren_admin")) { - List departList = sysUserDepartService.list(new LambdaQueryWrapper().eq(SysUserDepart::getDepId, loginUser.getOrgId())); - userIds = Optional.ofNullable(departList).orElse(new LinkedList<>()).stream().map(u -> u.getUserId()).collect(Collectors.toList()); - } - user.setUserType("shenbaoren"); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); - if (ObjectUtil.isNotEmpty(userIds)) { - queryWrapper.in("id", userIds); + if (StringUtils.equals(roleCode, "shenbaoren_role")) { + queryWrapper.eq("org_code", loginUser.getOrgCode()); + } else { + queryWrapper.likeRight("org_code", loginUser.getOrgCode()); } return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo); } @@ -1967,7 +1962,7 @@ public class SysUserController { SysDepart depart = sysDepartService.getById(departmentid); //所先部门状态为0时，说明该部门注册后未通过审核，申报人此时不能选择该部门注册 - if(StringUtils.equals(depart.getStatus(),"0")){ + if (StringUtils.equals(depart.getStatus(), "0")) { throw new JeecgBootException("该单位未通过审核,暂时不能注册为该单位申报人"); } 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
栏目列表
-
全部
+
全部
{{ i.name }}
@@ -84,6 +84,9 @@ } }; const getindexallarticleEvent = async () => { + columnId.value = '0'; + console.log( columnId.value); + const res = await getindexallarticle(); console.log(res); newList.value = res.records; @@ -97,6 +100,7 @@ path: '/main-home/newsInfo', query: { id: item.id, + type:1 }, }); }; diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue index f969e95..8c0ece9 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/articleManagement/index.vue @@ -20,8 +20,8 @@
栏目列表
-
全部
-
{{ i.name }}
+
全部
+
{{ i.name }}
@@ -43,6 +43,8 @@ pageSize: 10, pageNo: 1, }); + const columnId = ref(''); + const newColumnList = ref([]); const getindexcolumnEvent = async () => { const res = await getindexcolumn(); @@ -63,7 +65,6 @@ newList.value = res.records; total.value = res.total; }; - const columnId = ref(''); const onChange = (page) => { console.log(page); page.pageNo = page; @@ -74,6 +75,7 @@ } }; const getindexallarticleEvent = async () => { + columnId.value = '0'; const res = await getindexgzdt(); console.log(res); newList.value = res.records; @@ -88,6 +90,7 @@ path: '/main-home/newsInfo', query: { id: item.id, + type:3 }, }) } @@ -192,9 +195,9 @@ border-bottom: 1px solid #d9d9d9; cursor: pointer; } - .item:hover { - color: #002e97; - } + .active{ + color: #002e97 !important; + } } } } diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue index 8a55f47..e2f4297 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/columnManagement/index.vue @@ -20,8 +20,9 @@
栏目列表
-
全部
-
{{ i.name }}
+ +
全部
+
{{ i.name }}
@@ -43,6 +44,8 @@ pageSize: 10, pageNo: 1, }); + const columnId = ref(''); + const newColumnList = ref([]); const getindexcolumnEvent = async () => { const res = await getindexcolumn(); @@ -63,7 +66,6 @@ newList.value = res.records; total.value = res.total; }; - const columnId = ref(''); const onChange = (page) => { console.log(page); page.pageNo = page; @@ -74,6 +76,7 @@ } }; const getindexallarticleEvent = async () => { + columnId.value = '0' const res = await getindexnotice(); console.log(res); newList.value = res.records; @@ -88,6 +91,7 @@ path: '/main-home/newsInfo', query: { id: item.id, + type:2 }, }) } @@ -112,6 +116,7 @@ border-bottom: 2px solid #ccc; padding-bottom: 45px; margin-top: 40px; + .left { width: 100px; height: 100px; @@ -192,9 +197,9 @@ border-bottom: 1px solid #d9d9d9; cursor: pointer; } - .item:hover { - color: #002e97; - } + // .item:hover { + // color: #002e97; + // } } } } @@ -209,4 +214,7 @@ display: flex; justify-content: center; } + .active{ + color: #002e97 !important; + } diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue index 830c12f..f49de7c 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/homePage/index.vue @@ -41,7 +41,7 @@
    -
  • {{ item.title }}
    • +
  • {{ item.title }}
@@ -57,7 +57,7 @@
    -
  • {{ item.title }}
    • +
  • {{ item.title }}
@@ -68,7 +68,7 @@
    -
  • {{ item.title }}
    • +
  • {{ item.title }}
@@ -150,11 +150,12 @@ const goToNewList = () => { router.push('/main-home/newsList'); }; - const goToNewInfo = (item) => { + const goToNewInfo = (item,type=1) => { router.push({ path: '/main-home/newsInfo', query: { id: item.id, + type:type }, }); }; @@ -525,13 +526,13 @@ color: #fff; } :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots) { - justify-content: end; - bottom: 4px; - right: 5px; + justify-content: end !important; + bottom: 4px !important; + right: 5px !important; } :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots li button) { - width: 8px; - height: 8px; - border-radius: 50%; + width: 8px !important; + height: 8px !important; + border-radius: 50% !important; } diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue index 169616d..4624d73 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue @@ -1,13 +1,13 @@