FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yuezhihang
2022-03-22 17:30:38 +08:00
parent 86b9eabd03 7e41d25944
commit 87e36d5088
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application.properties
+1 -1
View File
@@ -138,7 +138,7 @@ stand.edit.file.path = /data/slrs/file/
file.downloadUrl=https://srms.foton.com.cn/file/ file.downloadUrl=https://srms.foton.com.cn/file/
#上传文件白名单-以,分隔 #上传文件白名单-以,分隔
upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg
# ============================================================================= # =============================================================================
# elasticsearch 配置 # elasticsearch 配置
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+18 -18
View File
@@ -151,12 +151,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
qw.isNull("PARENT_ID"); qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw); List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(userId); // List<String> getMenuIdList = tsUserService.getResourceUserId(userId);
if (!getMenuIdList.isEmpty()) { // if (!getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList); // page.setMenuRoleList(getMenuIdList);
} else { // } else {
page.setMenuRoleList(null); // page.setMenuRoleList(null);
} // }
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId()); List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) { if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids); page.setMenuAllChildrenIdList(ids);
@@ -180,12 +180,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
qw.isNull("PARENT_ID"); qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw); List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(userId); // List<String> getMenuIdList = tsUserService.getResourceUserId(userId);
if (!getMenuIdList.isEmpty()) { // if (!getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList); // page.setMenuRoleList(getMenuIdList);
} else { // } else {
page.setMenuRoleList(null); // page.setMenuRoleList(null);
} // }
List<String> ids = iTsResourceService.getChildMenuList(userId); List<String> ids = iTsResourceService.getChildMenuList(userId);
if (ids != null && !ids.isEmpty()) { if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids); page.setMenuAllChildrenIdList(ids);
@@ -429,12 +429,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
qw.isNull("PARENT_ID"); qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw); List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); // List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) { // if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList); // page.setMenuRoleList(getMenuIdList);
} else { // } else {
page.setMenuRoleList(null); // page.setMenuRoleList(null);
} // }
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId()); List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) { if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids); page.setMenuAllChildrenIdList(ids);
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java
+3 -6
View File
@@ -13,10 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
/** /**
* <p> * <p>
@@ -44,7 +41,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl<WgCommitteeDao, WgCommit
wgCommittee.setCommitteer(id); wgCommittee.setCommitteer(id);
List<WgCommitteeUser> list=new ArrayList<>(); List<WgCommitteeUser> list=new ArrayList<>();
if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) { if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) {
List<String> res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(","))); List<String> res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds()));
res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer()))); res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer())));
iWgCommitteeUserService.saveOrUpdateBatch(list); iWgCommitteeUserService.saveOrUpdateBatch(list);
} }
@@ -61,7 +58,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl<WgCommitteeDao, WgCommit
iWgCommitteeService.updateById(wgCommittee); iWgCommitteeService.updateById(wgCommittee);
List<WgCommitteeUser> save=new ArrayList<>(); List<WgCommitteeUser> save=new ArrayList<>();
if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){ if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){
List<String> res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds())); List<String> res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds()));
res.forEach(s -> res.forEach(s ->
save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s)) save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s))
); );