仅能查看自己租户下的专题库 2022/9/21

PAS/src/main/java/cn/cslg/pas/common/utils/auth/TreeUtils.java

@@ -181,7 +181,7 @@ public class TreeUtils {
                         Class<?> personClass = personnelVO.getClass();
                         Field dataField = personClass.getDeclaredField(sourceField);
                         dataField.setAccessible(true);
-                        reField = field.replace("local." + sourceField, dataField.get(personnelVO).toString());
+                        reField = reField.replace("local." + sourceField, dataField.get(personnelVO).toString());
                     }
                 }
             }

PAS/src/main/java/cn/cslg/pas/controller/CustomAnalysisItemController.java

@@ -40,7 +40,7 @@ public class CustomAnalysisItemController {
         return Response.success(customAnalysisItemService.getTreeList(projectId));
     }
 
-    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/addGroup")
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/saveAs")
     @Permission(roles = {1})
     @PostMapping("add")
     @Operation(summary = "新增分析项")
@@ -54,7 +54,7 @@ public class CustomAnalysisItemController {
         return Response.success(customAnalysisItemService.getItemByUid(uid));
     }
 
-    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/groupModify")
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/save")
     @Permission(roles = {1})
     @PostMapping("edit")
     @Operation(summary = "编辑分析项")

PAS/src/main/java/cn/cslg/pas/domain/ProjectUser.java

@@ -47,6 +47,12 @@ public class ProjectUser extends BaseEntity<ProjectUser> {
      */
     private Integer type;
 
+    /**
+     * 租户Id
+     */
+    @TableField("addtime")
+    private Integer tenantId;
+
     @TableField(exist = false)
     private List<String> roles;
 

PAS/src/main/java/cn/cslg/pas/service/PoiService.java

@@ -54,7 +54,7 @@ public class PoiService extends ServiceImpl<PatentPledgeMapper, PatentPledge> {
 
 for(int i=1 ;i<ps.size();i++)
 { PoiVO.Pg pg = new PoiVO.Pg();
-    if(ps.get(i).getStyle().equals("Word")) {
+    if(ps.get(i).getStyle().equals("word")) {
         XWPFRun rh = ps.get(i).getRuns().get(0);
         pg.setFontSize(rh.getFontSize());
         pg.setFontFamily(rh.getFontFamily());
@@ -167,16 +167,19 @@ String[] row =org.split("\\|\\|");
         FileOutputStream out = new FileOutputStream("C:\\\\BaiduNetdiskDownload\\\\生成\\\\first.docx");
         CTSectPr sectPr = doc.getDocument().getBody().addNewSectPr();
         XWPFHeaderFooterPolicy policy = new XWPFHeaderFooterPolicy(doc, sectPr);
+
+
+        this.createFooter(doc);
         //添加页脚
-        CTP ctpFooter = CTP.Factory.newInstance();
-        CTR ctrFooter = ctpFooter.addNewR();
-        CTText ctFooter = ctrFooter.addNewT();
-        String footerText = "ctpFooter";
-        ctFooter.setStringValue(footerText);
-        XWPFParagraph footerParagraph = new XWPFParagraph(ctpFooter, doc);
-        XWPFParagraph[] parsFooter = new XWPFParagraph[1];
-        parsFooter[0] = footerParagraph;
-        policy.createFooter(XWPFHeaderFooterPolicy.DEFAULT, parsFooter);
+//        CTP ctpFooter = CTP.Factory.newInstance();
+//        CTR ctrFooter = ctpFooter.addNewR();
+//        CTText ctFooter = ctrFooter.addNewT();
+//        String footerText = "ctpFooter";
+//        ctFooter.setStringValue(footerText);
+//        XWPFParagraph footerParagraph = new XWPFParagraph(ctpFooter, doc);
+//        XWPFParagraph[] parsFooter = new XWPFParagraph[1];
+//        parsFooter[0] = footerParagraph;
+//        policy.createFooter(XWPFHeaderFooterPolicy.DEFAULT, parsFooter);
         doc.write(out);
         out.close();
 

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -139,37 +139,6 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         params.setProIds(projectIds);
         params.setCreateBy(loginUtils.getId());
 
-        //判断登录人员是否含有系统管理员角色
-         Boolean flag=false;
-        List<PersonnelVO.PerRole> roles =user.getRList();
-       for(PersonnelVO.PerRole perRole : roles){
-           if(perRole.getRoleId()==1)
-           { flag=true;
-               break;
-           }
-       }
-       //如果没有的话，只能查询自己租户人员创建的专题库
-   if(!flag){
-       RequestBody reBodySource = new FormBody.Builder()
-               .add("tenantId", user.getTenantId().toString())
-               .build();
-       //建立连接
-       OkHttpClient okHttpClientSou = new OkHttpClient();
-       Request requestSou = new Request.Builder()
-               .url(url + "/permission/api/personnel/getPersonnelIds")
-               .post(reBodySource)
-               .addHeader("Cookie", LoginUtils.getToken())
-               .build();
-       //获得请求返回
-       String resSource = Objects.requireNonNull(okHttpClientSou.newCall(requestSou).execute().body()).string();
-
-       JSONArray jsonArray1 = JSON.parseArray(resSource);
-       // 获得字典
-       List<Integer> personnelIds = jsonArray1;
-       params.setPersonnelIds(personnelIds);
-   }
-
-
         SecurityUtils.startDataScope(m);
         IPage<Project> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
         List<Project> dataList = pageList.getRecords();