diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java index 32e282d4..3d4d5d48 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java @@ -315,6 +315,11 @@ public class AnnualCompetitionProjectRegistrationController { */ public Boolean isStipulateTime(String id) { AnnualCompPoint compPoint = annualCompPointService.query().eq("id", id).one(); + //判断是否需要报名 + if(compPoint.getRequireApply().equals("N")) + { + return false; + } Date date = new Date(); Date start = compPoint.getApplyStartTime(); Date end = compPoint.getApplyEndTime(); diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index 2ec02b5a..8a5c2f13 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -326,7 +326,9 @@ public class SysRoleController { .ne(SysRole::getRoleCode, "user") // 排除 用户角色 .ne(SysRole::getRoleCode, "ZJ") // 专家 .ne(SysRole::getRoleCode, "committee") // 组委会管理员 + .ne(SysRole::getRoleCode, "superAdmin") // 组委会管理员 .ne(SysRole::getRoleCode, "Department");//院系管理员 + List list = sysRoleService.list(query); if(list==null||list.size()<=0) { result.error500("未找到角色信息"); diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index bdc40fa6..f4d683cd 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -99,7 +99,6 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public List getDepartByuserId(String id) { - return userMapper.getDepartByuserId(id); } @@ -1326,10 +1325,25 @@ public class SysUserServiceImpl extends ServiceImpl impl Result> result = new Result>(); LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal(); + List dep_ids=getDepartByuserId(user.getId()); //TODO 外部模拟登陆临时账号，列表不显示 queryWrapper.ne("username", "_reserve_user_external"); - queryWrapper.like("org_code", user.getOrgCode()+"%"); - queryWrapper.eq("username",user.getUsername()); + //queryWrapper.like("org_code", user.getOrgCode()); + + if (oConvertUtils.isNotEmpty(dep_ids)) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(SysUserDepart::getDepId, dep_ids.get(0)); + List list = sysUserDepartMapper.selectList(query); + List userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); + //update-begin---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------ + if (oConvertUtils.listIsNotEmpty(userIds)) { + queryWrapper.in("id", userIds); + } else { + return Result.OK(); + } + //update-end---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------ + } + Page page = new Page(pageNo, pageSize); IPage pageList = this.page(page, queryWrapper); //批量查询用户的所属部门 diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index aed75ca4..6085e396 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -133,9 +133,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://182.92.169.222:3306/hnjd_comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://10.121.0.28:3306/hnjd_comp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: ycwl2022. + password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 10.121.0.28 #multi-datasource1: diff --git a/jeecgboot-vue3-master/src/views/TongfenComp/TongfenCompList.vue b/jeecgboot-vue3-master/src/views/TongfenComp/TongfenCompList.vue index a6946940..46aba1f9 100644 --- a/jeecgboot-vue3-master/src/views/TongfenComp/TongfenCompList.vue +++ b/jeecgboot-vue3-master/src/views/TongfenComp/TongfenCompList.vue @@ -13,7 +13,7 @@