From 9177eab432544ca78e4a0a4d6f6ae12267cf9af9 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 21 Oct 2020 11:12:12 +0800 Subject: [PATCH 1/5] rjuq whnt --- .../app/controller/StaffRoleController.java | 6 +++ .../lz/modules/flow/dao/StaffRoleMapper.java | 2 + .../com/lz/modules/flow/entity/StaffRole.java | 52 +++++++++++++++++-- .../flow/service/StaffRoleService.java | 2 + .../service/impl/StaffRoleServiceImpl.java | 6 +++ .../resources/mapper/flow/StaffRoleMapper.xml | 21 ++++++-- src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 7 files changed, 84 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 29d3f5b3..b9a685c6 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -63,6 +63,12 @@ public class StaffRoleController { } + @RequestMapping("/listByGroupId") + public R listByGroupId(Long id ) { + List staffRoles = staffRoleService.selectByGroupId(id); + return R.ok().put("staffRoles", staffRoles); + } + /** * 信息 */ diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java index b236701a..9a93afca 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java @@ -40,4 +40,6 @@ public interface StaffRoleMapper extends BaseMapper { List selectByRole(@Param("departmentLevel") String departmentLevel); List selectByCondition(@Param("page") IPage page, @Param("params") Map params); + + List selectByGroupId(@Param("id") Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/StaffRole.java b/src/main/java/com/lz/modules/flow/entity/StaffRole.java index d306d7c6..6c69ce93 100644 --- a/src/main/java/com/lz/modules/flow/entity/StaffRole.java +++ b/src/main/java/com/lz/modules/flow/entity/StaffRole.java @@ -1,35 +1,49 @@ package com.lz.modules.flow.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** *

-* 菜单权限表 *

*流转关系表 * @author quyixiao -* @since 2020-08-23 +* @since 2020-10-21 */ @Data @TableName("lz_staff_role") +@ApiModel(value = "流转关系表") public class StaffRole implements java.io.Serializable { // @TableId(value = "id", type = IdType.AUTO) private Long id; //是否删除状态，1：删除，0：有效 + @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete") private Integer isDelete; //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") private Date gmtCreate; //最后修改时间 + @ApiModelProperty(value = "最后修改时间", name = "gmtModified") private Date gmtModified; //员工 id + @ApiModelProperty(value = "员工 id", name = "staffId") private Long staffId; //角色 + @ApiModelProperty(value = "角色", name = "departmentLevel") private String departmentLevel; //角色 id + @ApiModelProperty(value = "角色 id", name = "typeRoleIds") private String typeRoleIds; + //员工名称 + @ApiModelProperty(value = "员工名称", name = "staffName") + private String staffName; + //组id + @ApiModelProperty(value = "组id", name = "evaluationGroupId") + private Long evaluationGroupId; /** * * @return @@ -135,6 +149,36 @@ public class StaffRole implements java.io.Serializable { this.typeRoleIds = typeRoleIds; } + /** + * 员工名称 + * @return + */ + public String getStaffName() { + return staffName; + } + /** + * 员工名称 + * @param staffName + */ + public void setStaffName(String staffName) { + this.staffName = staffName; + } + + /** + * 组id + * @return + */ + public Long getEvaluationGroupId() { + return evaluationGroupId; + } + /** + * 组id + * @param evaluationGroupId + */ + public void setEvaluationGroupId(Long evaluationGroupId) { + this.evaluationGroupId = evaluationGroupId; + } + @Override public String toString() { return "StaffRole{" + @@ -145,6 +189,8 @@ public class StaffRole implements java.io.Serializable { ",staffId=" + staffId + ",departmentLevel=" + departmentLevel + ",typeRoleIds=" + typeRoleIds + + ",staffName=" + staffName + + ",evaluationGroupId=" + evaluationGroupId + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java index 5399afd3..fe116ab3 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java @@ -47,4 +47,6 @@ public interface StaffRoleService extends IService { SysRoleEntity getRole(Long id); List selectMenuList(); + + List selectByGroupId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index eb434264..1d3702c8 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -229,6 +229,12 @@ public class StaffRoleServiceImpl extends ServiceImpl selectByGroupId(Long id) { + + return staffRoleMapper.selectByGroupId(id); + } + public String getSuffix(Map departmentsStaffRelateEntityMap, Map staffMap, String departmentId, Map singleDepartmentsStaffRelate) { DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateEntityMap.get(departmentId); diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml index 69a78b03..f0f10ec4 100644 --- a/src/main/resources/mapper/flow/StaffRoleMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml @@ -11,12 +11,14 @@ + + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, staff_id AS staffId, department_level AS departmentLevel, type_role_ids AS typeRoleIds + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, staff_id AS staffId, department_level AS departmentLevel, type_role_ids AS typeRoleIds, staff_name AS staffName, evaluation_group_id AS evaluationGroupId @@ -32,6 +34,8 @@ staff_id, department_level, type_role_ids, + staff_name, + evaluation_group_id, is_delete, gmt_create, gmt_modified @@ -39,6 +43,8 @@ #{ staffId}, #{ departmentLevel}, #{ typeRoleIds}, + #{ staffName}, + #{ evaluationGroupId}, 0, now(), now() @@ -54,7 +60,9 @@ gmt_create = #{gmtCreate}, staff_id = #{staffId}, department_level = #{departmentLevel}, - type_role_ids = #{typeRoleIds} + type_role_ids = #{typeRoleIds}, + staff_name = #{staffName}, + evaluation_group_id = #{evaluationGroupId} ,gmt_modified = now() where id = #{id} @@ -69,7 +77,9 @@ gmt_create = #{gmtCreate}, staff_id = #{staffId}, department_level = #{departmentLevel}, - type_role_ids = #{typeRoleIds} + type_role_ids = #{typeRoleIds}, + staff_name = #{staffName}, + evaluation_group_id = #{evaluationGroupId} ,gmt_modified = now() where id = #{id} @@ -79,6 +89,8 @@ update lz_staff_role set is_delete = 1 where id=#{id} limit 1 + + @@ -94,6 +106,9 @@ order by id desc + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 7d298621..6f770727 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -78,7 +78,7 @@ public class MysqlMain { //list.add(new TablesBean("lz_result_model")); //list.add(new TablesBean("lz_result_score")); //list.add(new TablesBean("lz_result_taget_lib")); - list.add(new TablesBean("lz_flow_chart_detail_record")); + list.add(new TablesBean("lz_staff_role")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); From 53ed800463c78ecad68e594c9ffd106db0a72f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 21 Oct 2020 11:16:08 +0800 Subject: [PATCH 2/5] fix --- .../app/dao/DepartmentsStaffRelateDao.java | 2 +- .../modules/app/dao/StaffOccupationDao.java | 2 ++ .../DepartmentsStaffRelateService.java | 2 ++ .../app/service/StaffOccupationService.java | 2 ++ .../DepartmentsStaffRelateServiceImpl.java | 10 ++++++++++ .../impl/StaffOccupationServiceImpl.java | 10 ++++++++++ .../app/service/impl/StaffServiceImpl.java | 20 +++++-------------- .../impl/EvaluationGroupServiceImpl.java | 9 +++++++-- .../performance/res/AssessListRes.java | 18 ----------------- .../mapper/app/ResultRecordMapper.xml | 2 +- .../generator/DepartmentsStaffRelateDao.xml | 9 +++++++++ .../mapper/generator/StaffOccupationDao.xml | 9 +++++++++ 12 files changed, 58 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/com/lz/modules/performance/res/AssessListRes.java diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java index 2cd353b1..c79cdb10 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java @@ -63,5 +63,5 @@ public interface DepartmentsStaffRelateDao extends BaseMapper getDepartmentNameByStaffIds(@Param("staffIds") List staffIds); - + List selectStaffIdsByDepartments(@Param("deparmentIds")List deparmentIds); } diff --git a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java index 34f217a3..f0ce615e 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java @@ -31,4 +31,6 @@ public interface StaffOccupationDao extends BaseMapper { void updateAllOccupation(); void updateStatusByStaff(Long staffId, DepartmentStaffBo departmentStaffBo); + + List removeDimissionStaffByStaffIds(@Param("staffIds") List staffIds); } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java index c024b7eb..f2c7233a 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java @@ -40,5 +40,7 @@ public interface DepartmentsStaffRelateService extends IService selectStaffIdsByDepartments(List deparmentIds); } diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java index b1a63333..61ab3b85 100644 --- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java +++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java @@ -31,5 +31,7 @@ public interface StaffOccupationService extends IService void updateAllOccupation(); void updateStatusByStaff(Long staffId, DepartmentStaffBo departmentStaffBo); + + List removeDimissionStaffByStaffIds(List staffIds); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index c0e3b509..0d745290 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -3,8 +3,10 @@ package com.lz.modules.app.service.impl; import com.google.common.collect.Lists; import com.lz.common.utils.StringUtil; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -90,4 +92,12 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl selectStaffIdsByDepartments(List deparmentIds) { + if(CollectionUtils.isEmpty(deparmentIds)){ + return Collections.EMPTY_LIST; + } + return departmentsStaffRelateDao.selectStaffIdsByDepartments(deparmentIds); + } } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java index 112f331b..214bde65 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java @@ -10,9 +10,12 @@ import com.lz.modules.app.dao.StaffOccupationDao; import com.lz.modules.app.entity.StaffOccupationEntity; import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -62,4 +65,11 @@ public class StaffOccupationServiceImpl extends ServiceImpl removeDimissionStaffByStaffIds(List staffIds) { + if(CollectionUtils.isEmpty(staffIds)){ + return Collections.EMPTY_LIST; + } + return staffOccupationDao.removeDimissionStaffByStaffIds(staffIds); + } } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index e59bd75e..580c4b69 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -411,24 +412,13 @@ public class StaffServiceImpl extends ServiceImpl impleme return Lists.newArrayList(); } //获取所有人员 - List list = departmentsStaffRelateService.list(new QueryWrapper() - .select("staff_id") - .eq("is_delete", 0) - .in("department_id", deparmentIds)); + List list = departmentsStaffRelateService.selectStaffIdsByDepartments(deparmentIds); if(CollectionUtils.isEmpty(list)){ return Lists.newArrayList(); } - //获取人员个数去重 - List staffs = list.stream().map(e -> e.getStaffId() + "").collect(Collectors.toList()); - staffs.removeIf(s -> { - StaffOccupationInfoDto occupationByStaffId = staffOccupationService.getOccupationByStaffId(Long.valueOf(s)); - if(occupationByStaffId==null || "1".equals(occupationByStaffId.getStaffStatus())){ - return true; - } - return false; - }); - List staffdistincts = staffs.stream().distinct().collect(Collectors.toList()); - return staffdistincts; + //获取人员个数去重, 去除离职 + List data = staffOccupationService.removeDimissionStaffByStaffIds(list); + return new ArrayList<>(new HashSet(data)); } diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index c8e97948..8ad281d0 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.ISelect; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.EvaluationGroupMapper; import com.lz.modules.flow.entity.EvaluationGroup; @@ -33,6 +34,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl(new HashSet(depStaffIds)); + List distDepStaffIds = new ArrayList<>(new HashSet(depStaffIds)); + //去除离职 + List data = staffOccupationService.removeDimissionStaffByStaffIds(distDepStaffIds); + return data; } } diff --git a/src/main/java/com/lz/modules/performance/res/AssessListRes.java b/src/main/java/com/lz/modules/performance/res/AssessListRes.java deleted file mode 100644 index 948511e4..00000000 --- a/src/main/java/com/lz/modules/performance/res/AssessListRes.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lz.modules.performance.res; - -import lombok.Data; - -/** - * @Author: djc - * @Desc: - * @Date: 2020/10/20 15:54 - */ -@Data -public class AssessListRes { - //考核名称 - private String name; - //时间周期 - private String cycleTime; - //组人员 - private String groupNum; -} diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 404796d0..7dae2690 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -343,7 +343,7 @@ + + diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml index fcbde85d..c5e70cfc 100644 --- a/src/main/resources/mapper/generator/StaffOccupationDao.xml +++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml @@ -59,4 +59,13 @@ update lz_staff_occupation set staff_status=#{departmentStaffBo.status},resignation_time=null, position=#{departmentStaffBo.position}, staff_no=#{departmentStaffBo.employeeNo} where is_delete=0 and staff_id = #{staffId} + + From cfdc86c01e20877a1edfc5663f86ea551f681b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 21 Oct 2020 11:17:42 +0800 Subject: [PATCH 3/5] fix --- .../performance/service/impl/ChartResultServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index e7763d3a..a9f9a10e 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -55,16 +55,19 @@ public class ChartResultServiceImpl implements ChartResultService { AssessListReq query = new AssessListReq(); ChartStatisticalRes res; BeanUtils.copyProperties(req,query); + List process = resultRecordService.countNumByFlowProcess(query); res = new ChartStatisticalRes(); res.setType(0); res.setData(process); data.add(res); + List scoreLevel = resultRecordService.countNumByScoreLevel(query); res = new ChartStatisticalRes(); res.setType(1); res.setData(scoreLevel); data.add(res); + List strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L); List depstaff = this.countDepartmentAndStaffNum(strings); res = new ChartStatisticalRes(); @@ -80,10 +83,12 @@ public class ChartResultServiceImpl implements ChartResultService { if(CollectionUtils.isEmpty(staffIds)){ return Collections.EMPTY_LIST; } + List data = new ArrayList<>(); List list = departmentsStaffRelateService.list(new QueryWrapper() .eq("is_delete", 0) .in("staff_id", staffIds)); + Map map = Maps.newHashMap(); for(DepartmentsStaffRelateEntity entity:list){ String departmentId = entity.getDepartmentId(); From 79777b07fa076dcf28e2287f84cc19f9e311a706 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 21 Oct 2020 11:28:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/StaffRoleController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index b9a685c6..c78686e8 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -17,6 +17,10 @@ import com.lz.modules.flow.service.StaffRoleDepartmentService; import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,6 +38,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("user/lzstaffrole") +@Api(tags = "考评组管理员管理") public class StaffRoleController { @Autowired private StaffRoleService staffRoleService; @@ -63,9 +68,11 @@ public class StaffRoleController { } - @RequestMapping("/listByGroupId") - public R listByGroupId(Long id ) { - List staffRoles = staffRoleService.selectByGroupId(id); + @PostMapping("/listByGroupId") + @ApiOperation(value="根据groupId获取管理员列表") + @ApiImplicitParam(name = "groupId",value = "组id",defaultValue = "1",required = true, dataType = "Long",paramType = "query") + public R listByGroupId( Long groupId ) { + List staffRoles = staffRoleService.selectByGroupId(groupId); return R.ok().put("staffRoles", staffRoles); } From bbde768178f92116c0f62767bf698ff6f43a6fb0 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 21 Oct 2020 14:20:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/app/controller/StaffRoleController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 4f9d0e8a..343c18ec 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -74,7 +74,7 @@ public class StaffRoleController { } - @PostMapping("/listByGroupId") + @GetMapping("/listByGroupId") @ApiOperation(value="根据groupId获取管理员列表") @ApiImplicitParam(name = "groupId",value = "组id",defaultValue = "1",required = true, dataType = "Long",paramType = "query") public R listByGroupId( Long groupId ) {