LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 年度数据锁定

Browse Source
This commit is contained in:
lijiarao
2024-07-28 19:54:43 +08:00
parent 870771d863
commit 850334aba6
25 changed files with 201 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+18 -2
View File
@@ -158,7 +158,17 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public String translateDictFromTable(String table, String text, String code, String key) {
return sysDictService.queryTableDictTextByKey(table, text, code, key);
String s = sysDictService.queryTableDictTextByKey(table, text, code, key);
if ("pay_company_management_temporary".equals(table)){
if (StringUtils.isBlank(s)){
s = sysDictService.queryTableDictTextByKey("pay_company_management", text, code, key);
}
}else if ("pay_contacts_management_temporary".equals(table)){
if (StringUtils.isBlank(s)){
s = sysDictService.queryTableDictTextByKey("pay_contacts_management", text, code, key);
}
}
return s;
}
@Override
@@ -329,7 +339,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
table = QueryGenerator.getSqlRuleValue(table);
}
//update-end-author:taoyan date:20200820 for:【Online+系统】字典表加权限控制机制逻辑，想法不错 LOWCOD-799
return sysDictService.queryTableDictItemsByCode(table, text, code);
List<DictModel> dictModels = sysDictService.queryTableDictItemsByCode(table, text, code);
if ("pay_company_management_temporary".equals(table)){
dictModels.addAll(sysDictService.queryTableDictItemsByCode("pay_company_management", text, code));
}else if ("pay_contacts_management_temporary".equals(table)){
dictModels.addAll(sysDictService.queryTableDictItemsByCode("pay_contacts_management", text, code));
}
return dictModels;
}
@Override