Browse Source

修改:提交组信息编辑的时候,判断当前编辑人是否是组长,只有组长才允许编辑

dev_shibei_match
wxz 5 years ago
parent
commit
cd6f50a9de
  1. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  2. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  3. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -378,9 +378,9 @@ public class ResiGroupController {
* @return * @return
*/ */
@PostMapping("submit-edit") @PostMapping("submit-edit")
public Result submitGroupEdit(@RequestBody EditGroupFormDTO form){ public Result submitGroupEdit(@RequestBody EditGroupFormDTO form, @LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(form, EditGroupFormDTO.SubmitGroupEditVG.class); ValidatorUtils.validateEntity(form, EditGroupFormDTO.SubmitGroupEditVG.class);
resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction()); resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId());
return new Result(); return new Result();
} }

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@ -296,7 +296,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
GroupDetailResultDTO getGroupDetail(String groupId); GroupDetailResultDTO getGroupDetail(String groupId);
void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction); void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId);
/** /**
* @Description 工作端 查询组变更待审核列表 * @Description 工作端 查询组变更待审核列表

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -1061,13 +1061,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
} }
@Override @Override
public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction) { public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId) {
// 1.判断小组是否存在,判断是否已经在"待审核"状态 // 1.判断小组是否存在,判断是否已经在"待审核"状态
ResiGroupEntity group = resiGroupDao.selectById(groupId); ResiGroupEntity group = resiGroupDao.selectById(groupId);
if (group == null) { if (group == null) {
throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg()); throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg());
} }
// 判断是否是组长
ResiGroupMemberDTO groupLeader = resiGroupMemberDao.selectLeaderMember(groupId);
if (groupLeader == null || !groupLeader.getCustomerUserId().equals(editUserId)) {
String msg = "只有该组的组长才可以编辑组信息";
throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), msg, msg, RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
}
// 2.判断是否可以提交编辑 // 2.判断是否可以提交编辑
GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId); GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId);
if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) { if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) {

Loading…
Cancel
Save