wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3300: 调整信息

Browse Source
This commit is contained in:
yanglin 2025-02-27 16:20:18 +08:00
parent 8bf799dc26
commit 46700182a6
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java
View File

@ -49,6 +49,10 @@ public class EssPerson extends BaseEntity<EssPerson> implements OrgPerson {
return state == EssPersonState.AUTHORIZED; return state == EssPersonState.AUTHORIZED;
} }
public boolean is(Long personId) {
return this.personId != null && this.personId.equals(personId);
}
@Setter @Setter
@Getter @Getter
public static class RecordExt { public static class RecordExt {

20
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
View File

@ -1,6 +1,16 @@
package cn.axzo.nanopart.ess.server.ess; package cn.axzo.nanopart.ess.server.ess;
import static cn.axzo.nanopart.ess.server.utils.IdBuilder.idbuilder;
import java.util.function.Function;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse;
import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo;
import cn.axzo.nanopart.ess.api.domain.OrgPerson; import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import cn.axzo.nanopart.ess.api.domain.contract.Approver; import cn.axzo.nanopart.ess.api.domain.contract.Approver;
import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail; import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail;
@ -30,16 +40,8 @@ import cn.axzo.nanopart.ess.server.ess.mq.EssBroadcaster;
import cn.axzo.nanopart.ess.server.ess.support.OssService; import cn.axzo.nanopart.ess.server.ess.support.OssService;
import cn.axzo.nanopart.ess.server.utils.BizAssertions; import cn.axzo.nanopart.ess.server.utils.BizAssertions;
import cn.axzo.nanopart.ess.server.utils.BizTransactional; import cn.axzo.nanopart.ess.server.utils.BizTransactional;
import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse;
import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.function.Function;
import static cn.axzo.nanopart.ess.server.utils.IdBuilder.idbuilder;
/** /**
* @author yanglin * @author yanglin
@ -119,7 +121,7 @@ public class EssService {
if (!sealAndPerson.getSealPerson().isAuthorized()) if (!sealAndPerson.getSealPerson().isAuthorized())
return; return;
EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId()); EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能取消超级管理员的印章授权"); BizAssertions.assertFalse(superAdmin.is(request.getPersonId()), "不能取消超级管理员的印章授权");
essClient.removeSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealAndPerson.getSealPerson()); essClient.removeSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealAndPerson.getSealPerson());
orgManager.removeSealAuthorization(request.getEssSealId(), request.getPersonId()); orgManager.removeSealAuthorization(request.getEssSealId(), request.getPersonId());
} }

2
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java
View File

@ -176,8 +176,6 @@ public class OrgManager {
EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null); EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId()); BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId());
//noinspection DataFlowIssue //noinspection DataFlowIssue
EssPerson superAdmin = getSuperAdminOrThrow(seal.getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员");
EssSealPerson sealPerson = essSealPersonDao.find(seal.getEssSealId(), request.getPersonId(), true).orElse(null); EssSealPerson sealPerson = essSealPersonDao.find(seal.getEssSealId(), request.getPersonId(), true).orElse(null);
BizAssertions.assertNotNull(sealPerson, "印章人员不存在"); BizAssertions.assertNotNull(sealPerson, "印章人员不存在");
//noinspection DataFlowIssue //noinspection DataFlowIssue