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;
}