feat: There is no way the #47611

2021-09-06 17:42:34 +08:00
parent 5400f5c35d
commit e85d3daecb
2 changed files with 210 additions and 18 deletions
@@ -241,6 +241,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
            page = (SarBussionessStandEOPage)JSONObject.toBean(jsonObject, SarBussionessStandEOPage.class);
            page.setPage(1);
            page.setPageSize(10000);
+            //查询当前登录人角色拥有权限的菜单
+            if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+                QueryWrapper<TsResource> qw = new QueryWrapper<>();
+                qw.eq("ID",page.getMenuId());
+                qw.isNull("PARENT_ID");
+                List<TsResource> children = iTsResourceService.list(qw);
+                if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                    List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                    if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                        page.setMenuRoleList(getMenuIdList);
+                    } else {
+                        page.setMenuRoleList(null);
+                    }
+                    List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+                    if (ids != null && !ids.isEmpty()) {
+                        page.setMenuAllChildrenIdList(ids);
+                    }
+                }
+            }
            if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
                List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
                String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO");
@@ -250,24 +269,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                    page.setAdvanceSearchStr(null);
                }
            }
-            List<String> getMenuIdList = new ArrayList<>();
-            if(userId != null){
-                getMenuIdList= tsUserService.getResourceUserId(userId);
-            }
-            //            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
-            if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                page.setMenuRoleList(getMenuIdList);
-            } else {
-                page.setMenuRoleList(null);
-            }
-//        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
-            if(getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                page.setMenuRoleList(getMenuIdList);
-            }
-            List<String> ids = sarMenuEOService.getChildMenuList(page.getMenuId());
-            if (ids != null && !ids.isEmpty()) {
-                page.setMenuAllChildrenIdList(ids);
-            }
        }
        page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
        if(userId != null){
@@ -121,6 +121,197 @@ public class SarBussionessStandEOPage extends BasePage {
    private String shunxu;
    private String sql;

+    // 新增字段
+    private String FZRQBUSS;
+    private String FSRQBUSS;
+    private String FBGBUSS;
+    private String BZSMBUSS;
+    private String LSBBBUSS;
+    private String QTWJBUSS;
+    private String QCDW;
+    private String QCRBUSS;
+    private String WJSCRYBUSS;
+    private String SYCXCLASS;
+    private String NYLXCLASS;
+    private String SYCPXCLASS;
+    private String TXLBBUSS;
+    private String VPPSBMBUSS;
+    private String VPPSCNBUSS;
+    private String DTQBBHBUSS;
+    private String BDTQBBHBUSS;
+    private String XGJLBUSS;
+    private String XGLC;
+    private String GLWJBUSS;
+    private String XCSJBUSS;
+
+    public String getFZRQBUSS() {
+        return FZRQBUSS;
+    }
+
+    public void setFZRQBUSS(String FZRQBUSS) {
+        this.FZRQBUSS = FZRQBUSS;
+    }
+
+    public String getFSRQBUSS() {
+        return FSRQBUSS;
+    }
+
+    public void setFSRQBUSS(String FSRQBUSS) {
+        this.FSRQBUSS = FSRQBUSS;
+    }
+
+    public String getFBGBUSS() {
+        return FBGBUSS;
+    }
+
+    public void setFBGBUSS(String FBGBUSS) {
+        this.FBGBUSS = FBGBUSS;
+    }
+
+    public String getBZSMBUSS() {
+        return BZSMBUSS;
+    }
+
+    public void setBZSMBUSS(String BZSMBUSS) {
+        this.BZSMBUSS = BZSMBUSS;
+    }
+
+    public String getLSBBBUSS() {
+        return LSBBBUSS;
+    }
+
+    public void setLSBBBUSS(String LSBBBUSS) {
+        this.LSBBBUSS = LSBBBUSS;
+    }
+
+    public String getQTWJBUSS() {
+        return QTWJBUSS;
+    }
+
+    public void setQTWJBUSS(String QTWJBUSS) {
+        this.QTWJBUSS = QTWJBUSS;
+    }
+
+    public String getQCDW() {
+        return QCDW;
+    }
+
+    public void setQCDW(String QCDW) {
+        this.QCDW = QCDW;
+    }
+
+    public String getQCRBUSS() {
+        return QCRBUSS;
+    }
+
+    public void setQCRBUSS(String QCRBUSS) {
+        this.QCRBUSS = QCRBUSS;
+    }
+
+    public String getWJSCRYBUSS() {
+        return WJSCRYBUSS;
+    }
+
+    public void setWJSCRYBUSS(String WJSCRYBUSS) {
+        this.WJSCRYBUSS = WJSCRYBUSS;
+    }
+
+    public String getSYCXCLASS() {
+        return SYCXCLASS;
+    }
+
+    public void setSYCXCLASS(String SYCXCLASS) {
+        this.SYCXCLASS = SYCXCLASS;
+    }
+
+    public String getNYLXCLASS() {
+        return NYLXCLASS;
+    }
+
+    public void setNYLXCLASS(String NYLXCLASS) {
+        this.NYLXCLASS = NYLXCLASS;
+    }
+
+    public String getSYCPXCLASS() {
+        return SYCPXCLASS;
+    }
+
+    public void setSYCPXCLASS(String SYCPXCLASS) {
+        this.SYCPXCLASS = SYCPXCLASS;
+    }
+
+    public String getTXLBBUSS() {
+        return TXLBBUSS;
+    }
+
+    public void setTXLBBUSS(String TXLBBUSS) {
+        this.TXLBBUSS = TXLBBUSS;
+    }
+
+    public String getVPPSBMBUSS() {
+        return VPPSBMBUSS;
+    }
+
+    public void setVPPSBMBUSS(String VPPSBMBUSS) {
+        this.VPPSBMBUSS = VPPSBMBUSS;
+    }
+
+    public String getVPPSCNBUSS() {
+        return VPPSCNBUSS;
+    }
+
+    public void setVPPSCNBUSS(String VPPSCNBUSS) {
+        this.VPPSCNBUSS = VPPSCNBUSS;
+    }
+
+    public String getDTQBBHBUSS() {
+        return DTQBBHBUSS;
+    }
+
+    public void setDTQBBHBUSS(String DTQBBHBUSS) {
+        this.DTQBBHBUSS = DTQBBHBUSS;
+    }
+
+    public String getBDTQBBHBUSS() {
+        return BDTQBBHBUSS;
+    }
+
+    public void setBDTQBBHBUSS(String BDTQBBHBUSS) {
+        this.BDTQBBHBUSS = BDTQBBHBUSS;
+    }
+
+    public String getXGJLBUSS() {
+        return XGJLBUSS;
+    }
+
+    public void setXGJLBUSS(String XGJLBUSS) {
+        this.XGJLBUSS = XGJLBUSS;
+    }
+
+    public String getXGLC() {
+        return XGLC;
+    }
+
+    public void setXGLC(String XGLC) {
+        this.XGLC = XGLC;
+    }
+
+    public String getGLWJBUSS() {
+        return GLWJBUSS;
+    }
+
+    public void setGLWJBUSS(String GLWJBUSS) {
+        this.GLWJBUSS = GLWJBUSS;
+    }
+
+    public String getXCSJBUSS() {
+        return XCSJBUSS;
+    }
+
+    public void setXCSJBUSS(String XCSJBUSS) {
+        this.XCSJBUSS = XCSJBUSS;
+    }
+
    public String getZqcrId() {
        return zqcrId;
    }