cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
huwei 2026-07-15 14:56:12 +08:00
parent e8777e9f7c d301061cb2
commit 38362039d1
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java
View File

@ -95,7 +95,7 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setDeptName(query.getDeptName()); domainQuery.setDeptName(query.getDeptName());
PageResult<OrgDepartmentEntity> pageResult = orgDepartmentDomainService.page(domainQuery); PageResult<OrgDepartmentEntity> pageResult = orgDepartmentDomainService.page(domainQuery);

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
View File

@ -96,7 +96,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setDeviceName(query.getDeviceName()); domainQuery.setDeviceName(query.getDeviceName());
domainQuery.setInstrumentType(query.getInstrumentType()); domainQuery.setInstrumentType(query.getInstrumentType());
domainQuery.setDeviceType(query.getDeviceType()); domainQuery.setDeviceType(query.getDeviceType());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java
View File

@ -92,7 +92,7 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setPersonnelId(query.getPersonnelId());
domainQuery.setCertName(query.getCertName()); domainQuery.setCertName(query.getCertName());
domainQuery.setCertTypeCode(query.getCertTypeCode()); domainQuery.setCertTypeCode(query.getCertTypeCode());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelChangeExecutor.java
View File

@ -75,7 +75,7 @@ public class OrgPersonnelChangeExecutor implements OrgPersonnelChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setPersonnelId(query.getPersonnelId());
domainQuery.setChangeItem(query.getChangeItem()); domainQuery.setChangeItem(query.getChangeItem());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
View File

@ -136,7 +136,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setDeptId(query.getDeptId()); domainQuery.setDeptId(query.getDeptId());
domainQuery.setPostId(query.getPostId()); domainQuery.setPostId(query.getPostId());
domainQuery.setUserName(query.getUserName()); domainQuery.setUserName(query.getUserName());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java
View File

@ -72,7 +72,7 @@ public class OrgPositionExecutor implements OrgPositionApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setDeptId(query.getDeptId()); domainQuery.setDeptId(query.getDeptId());
domainQuery.setPositionName(query.getPositionName()); domainQuery.setPositionName(query.getPositionName());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java
View File

@ -91,7 +91,7 @@ public class OrgQualificationExecutor implements OrgQualificationApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setCertName(query.getCertName()); domainQuery.setCertName(query.getCertName());
domainQuery.setCertNo(query.getCertNo()); domainQuery.setCertNo(query.getCertNo());
domainQuery.setEnableFlag(query.getEnableFlag()); domainQuery.setEnableFlag(query.getEnableFlag());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java
View File

@ -106,7 +106,7 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setPersonnelId(query.getPersonnelId()); domainQuery.setPersonnelId(query.getPersonnelId());
domainQuery.setAuditStatusCode(query.getAuditStatusCode()); domainQuery.setAuditStatusCode(query.getAuditStatusCode());
domainQuery.setApplicantName(query.getApplicantName()); domainQuery.setApplicantName(query.getApplicantName());

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
View File

@ -186,7 +186,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
QualFilingChangeQuery domainQuery = new QualFilingChangeQuery(); QualFilingChangeQuery domainQuery = new QualFilingChangeQuery();
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setOrgId(query.getOrgId() == null ? ThreadLocalUserInfoAdapter.getOrgId() : query.getOrgId());
domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());