geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复缺失的service文件

Browse Source
This commit is contained in:
Je
2025-02-11 19:03:24 +08:00
parent a39ae9829c
commit 53f6b750da
16 changed files with 106 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xjrsoft-service/xjrsoft-service-form/pom.xml
View File

@ -50,7 +50,11 @@
<artifactId>xjrsoft-service-magicapi-api</artifactId>
<version>${xjrsoft.framework.version}</version>
</dependency>
<dependency>
<groupId>com.xjrsoft</groupId>
<artifactId>xjrsoft-service-generate-api</artifactId>
<version>${xjrsoft.framework.version}</version>
</dependency>
<dependency>
<groupId>com.xjrsoft</groupId>

27
xjrsoft-service/xjrsoft-service-form/src/main/java/com/xjrsoft/form/service/impl/FormExecuteServiceImpl.java
View File

@ -1501,17 +1501,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
queryExpression = new AndExpression(queryExpression, dataAuthExpression);
}
}
// 添加租户过滤条件
if (BooleanUtils.isTrue(tenantConfig.getEnabled())) {
EqualsTo tenantExp = new EqualsTo();
tenantExp.setLeftExpression(new net.sf.jsqlparser.schema.Column(tenantConfig.getTenantField()));
tenantExp.setRightExpression(new LongValue(SecureUtil.getTenantId()));
if(queryExpression == null) {
queryExpression = tenantExp;
} else {
queryExpression = new AndExpression(new Parenthesis(queryExpression), tenantExp);
}
}
plainSelect.setWhere(queryExpression);
//将所有查询的数据id 转string
@ -1824,17 +1814,6 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
queryExpression = new AndExpression(queryExpression, dataAuthExpression);
}
}
// 添加租户过滤条件
if (BooleanUtils.isTrue(tenantConfig.getEnabled())) {
EqualsTo tenantExp = new EqualsTo();
tenantExp.setLeftExpression(new net.sf.jsqlparser.schema.Column(tenantConfig.getTenantField()));
tenantExp.setRightExpression(new LongValue(SecureUtil.getTenantId()));
if (queryExpression != null){
queryExpression = new AndExpression(new Parenthesis(queryExpression), tenantExp);
} else {
queryExpression = tenantExp;
}
}
plainSelect.setWhere(queryExpression);
Db use = Db.use(datasource);
use.setRunner(new XjrSqlConnRunner(DialectFactory.getDialect(datasource)));
@ -2279,10 +2258,6 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
}
}
}
// 添加租户id数据
if (BooleanUtils.isTrue(tenantConfig.getEnabled())) {
resultData.put(tenantConfig.getTenantField(), SecureUtil.getTenantId());
}
return resultData;
}

6
xjrsoft-service/xjrsoft-service-organization/pom.xml
View File

@ -52,7 +52,11 @@
<groupId>com.cloud.govern</groupId>
<artifactId>service-invoke-sdk</artifactId>
</dependency>
<dependency>
<groupId>com.xjrsoft</groupId>
<artifactId>xjrsoft-service-system-api</artifactId>
<version>${xjrsoft.framework.version}</version>
</dependency>
</dependencies>
<build>

6
xjrsoft-service/xjrsoft-service-organization/src/main/java/com/xjrsoft/organization/client/DepartmentClient.java
View File

@ -63,4 +63,10 @@ public class DepartmentClient implements IDepartmentClient {
public void departmentCacheFeign() {
departmentService.departmentCache();
}
@Override
public List<Department> queryPathFromRoot(List<Department> list) {
return departmentService.queryPathFromRoot(list);
}
}

6
xjrsoft-service/xjrsoft-service-organization/src/main/java/com/xjrsoft/organization/controller/UserController.java
View File

@ -123,9 +123,9 @@ public class UserController {
SaSession tokenSession = StpUtil.getTokenSession();
User user = tokenSession.get(GlobalConstant.LOGIN_USER_INFO_KEY, new User());
UserInfoVo currentInfo = userService.getCurrentInfo(user);
currentInfo.setTenantId(SecureUtil.getCurrentTenantId());
currentInfo.setTenantCode(SecureUtil.getCurrentTenantCode());
currentInfo.setTenantName(SecureUtil.getCurrentTenantName());
// currentInfo.setTenantId(SecureUtil.getCurrentTenantId());
// currentInfo.setTenantCode(SecureUtil.getCurrentTenantCode());
// currentInfo.setTenantName(SecureUtil.getCurrentTenantName());
return R.ok(currentInfo);
}

20
xjrsoft-service/xjrsoft-service-system/src/main/java/com/xjrsoft/system/controller/MenuController.java
View File

@ -65,17 +65,8 @@ public class MenuController {
@GetMapping("/list")
@Operation(summary = "获取所有菜单（不分页）")
public R list() {
List<Long> tenantAuthMenuIds = null;
boolean isAdminTenant = SecureUtil.isAdminTenant();
if (!isAdminTenant) {
tenantAuthMenuIds = menuService.getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return R.ok(new ArrayList<>(0));
}
}
List<Menu> list = menuService.list(Wrappers.lambdaQuery(Menu.class)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty()))
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds));
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty())));
List<MenuListVo> menuListVos = BeanUtil.copyToList(list, MenuListVo.class);
return R.ok(TreeUtil.build(menuListVos));
}
@ -93,14 +84,6 @@ public class MenuController {
@GetMapping("/all-tree")
@Operation(summary = "获取所有菜单（树结构）")
public R allMenuTree(@Valid MenuTreeDto dto) {
List<Long> tenantAuthMenuIds = null;
boolean isAdminTenant = SecureUtil.isAdminTenant();
if (!isAdminTenant&&tenantConfig.getEnabled()) {
tenantAuthMenuIds = menuService.getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return R.ok(new ArrayList<>(0));
}
}
List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class,
MPJWrappers.<Menu>lambdaJoin()
.disableSubLogicDel()
@ -110,7 +93,6 @@ public class MenuController {
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.selectAs(Subsystem::getName, MenuTreeVo::getSystemName)
.eq(ObjectUtils.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds)
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.orderByAsc(Menu::getSortCode));
List<MenuTreeVo> treeVoList = TreeUtil.build(list);

39
xjrsoft-service/xjrsoft-service-system/src/main/java/com/xjrsoft/system/service/impl/MenuServiceImpl.java
View File

@ -61,14 +61,6 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
@Override
public List<MenuVo> getAuthMenuList(MenuTreeDto dto) {
// 租户授权菜单
List<Long> tenantAuthMenuIds = null;
if (BooleanUtils.isTrue(tenantConfig.getEnabled())&&!SecureUtil.isAdminTenant()) {
tenantAuthMenuIds = getTenantAuthMenuIds(Long.parseLong(SecureUtil.getTenantId()));
if (CollectionUtils.isEmpty(tenantAuthMenuIds)) {
return new ArrayList<>();
}
}
List<UserRoleRelation> relations = userRoleRelationClient.getUserRoleRelationListByUserIdFeign(StpUtil.getLoginIdAsLong());
if (CollectionUtils.isEmpty(relations)) {
return new ArrayList<>();
@ -88,22 +80,21 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
return this.selectJoinList(MenuVo.class,
MPJWrappers.<Menu>lambdaJoin()
.disableSubLogicDel()
.like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
.like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
.like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
// .like(ObjectUtil.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
.select(Menu::getId)
.selectAs(Subsystem::getName, MenuVo::getSystemName)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.leftJoin(WorkflowSchema.class,WorkflowSchema::getFormId, Menu::getFormId)
.selectAs(WorkflowSchema::getId,MenuVo::getSchemaId)
.in(CollectionUtils.isNotEmpty(tenantAuthMenuIds), Menu::getId, tenantAuthMenuIds)
.eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
.orderByAsc(Subsystem::getSortCode)
.orderByAsc(Menu::getSortCode));
.disableSubLogicDel()
.like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
.like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
.like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
// .like(ObjectUtil.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
.in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
.select(Menu::getId)
.selectAs(Subsystem::getName, MenuVo::getSystemName)
.select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
.leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
.leftJoin(WorkflowSchema.class,WorkflowSchema::getFormId, Menu::getFormId)
.selectAs(WorkflowSchema::getId,MenuVo::getSchemaId)
.eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
.orderByAsc(Subsystem::getSortCode)
.orderByAsc(Menu::getSortCode));
}
public List<Long> getTenantAuthMenuIds(Long tenantId) {

42
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/service/impl/WorkflowExecuteServiceImpl.java
View File

@ -4679,27 +4679,27 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
.superProcessInstanceId(dto.getProcessId()).list();
//当前流程是否有父级流程,就是外部流程或者子流程。外部流程或者子流程不能撤回到开始节点，不新增开始节点
if (subProcess.size() < 1) {
//获取到当前流程发起人 如果操作人 是发起人 默认新增开始节点
Object startUserId = runtimeService.getVariable(dto.getProcessId(), WorkflowConstant.PROCESS_START_USER_ID_KEY);
if (StpUtil.getLoginIdAsLong() == Convert.toLong(startUserId)) {
List<HistoricActivityInstance> startList = historyService.createHistoricActivityInstanceQuery()
.processInstanceId(dto.getProcessId())
.activityType(WorkflowConstant.BPMN_START_EVENT_TYPE_NAME)
.finished()
.orderByHistoricActivityInstanceEndTime()
.desc()
.list();
HistoricActivityInstance historicActivityInstance = startList.get(0);
RejectNodeVo vo = new RejectNodeVo();
vo.setActivityId(historicActivityInstance.getActivityId());
vo.setActivityName(historicActivityInstance.getActivityName());
voList.add(vo);
}
}
// if (subProcess.size() < 1) {
// //获取到当前流程发起人 如果操作人 是发起人 默认新增开始节点
// Object startUserId = runtimeService.getVariable(dto.getProcessId(), WorkflowConstant.PROCESS_START_USER_ID_KEY);
// if (StpUtil.getLoginIdAsLong() == Convert.toLong(startUserId)) {
//
// List<HistoricActivityInstance> startList = historyService.createHistoricActivityInstanceQuery()
// .processInstanceId(dto.getProcessId())
// .activityType(WorkflowConstant.BPMN_START_EVENT_TYPE_NAME)
// .finished()
// .orderByHistoricActivityInstanceEndTime()
// .desc()
// .list();
//
// HistoricActivityInstance historicActivityInstance = startList.get(0);
//
// RejectNodeVo vo = new RejectNodeVo();
// vo.setActivityId(historicActivityInstance.getActivityId());
// vo.setActivityName(historicActivityInstance.getActivityName());
// voList.add(vo);
// }
// }
if (list == null || list.size() == 0) {
return voList;