调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -142,7 +142,7 @@ public class CwProjectReportController {
      * @return
      */
     @ApiLog("查询财务报告信息列表")
-    @PreAuthorize("hasAuthority('cwProjectReport:list')")
+    //@PreAuthorize("hasAuthority('cwProjectReport:list')")
     @GetMapping("list")
     public ResponseEntity<IPage<CwProjectReportData>> data(CwProjectReportData projectReportData, Page<CwProjectReportData> page) throws Exception {
         IPage<CwProjectReportData> result = new Page<CwProjectReportData>();

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -1182,7 +1182,7 @@ public class UserController {
     @ApiLog("获取财务部门用户数据")
     @GetMapping("treeUserDataFinanceOffice")
     public ResponseEntity treeUserDataFinanceOffice(@RequestParam(required = false) String officeName,@RequestParam(required = false) String extId, @RequestParam(required = false) String type, @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
-        officeName = "ccpm项目子公司";
+        officeName = "苏州分公司";
         List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
         if(list.size()>0){
             List<String> officeIds = Lists.newArrayList();
@@ -1336,7 +1336,7 @@ public class UserController {
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         String id = userDTO.getTenantDTO().getId();
         if(id.equals("10005")){
-            String officeName="ccpm项目子公司";
+            String officeName="苏州分公司";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
                 List<String> officeIds = Lists.newArrayList();
@@ -1366,7 +1366,7 @@ public class UserController {
             List rootTree = officeService.getFinanceTree (objects1, extId, type, showAll, "1");
             return ResponseEntity.ok (rootTree);
         }else if (id.equals("10002")){
-            String officeName="ccpm项目子公司";
+            String officeName="苏州分公司";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
                 List<String> officeIds = Lists.newArrayList();
@@ -1397,7 +1397,7 @@ public class UserController {
             return ResponseEntity.ok (rootTree);
 
         }else if (id.equals("10006")){
-            String officeName="ccpm项目子公司";
+            String officeName="苏州分公司";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
                 List<String> officeIds = Lists.newArrayList();
@@ -1428,7 +1428,7 @@ public class UserController {
             return ResponseEntity.ok (rootTree);
 
         }else if (id.equals("10004")){
-            String officeName="ccpm项目子公司";
+            String officeName="苏州分公司";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
                 List<String> officeIds = Lists.newArrayList();
@@ -1459,7 +1459,7 @@ public class UserController {
             return ResponseEntity.ok (rootTree);
 
         }else {
-            String officeName="ccpm项目子公司";
+            String officeName="苏州分公司";
             List<OfficeDTO> list = officeService.getOfficeAllByOfficeName (officeName);
             if(list.size()>0){
                 List<String> officeIds = Lists.newArrayList();

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -78,7 +78,7 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
             if (userDTO.getCompanyDTO().getName().contains("评估")) {
                 queryWrapper.like ( "a.name", "%评估%" );
             }else if (userDTO.getCompanyDTO().getName().contains("会计")){
-                //获取ccpm项目子公司的子集id
+                //获取苏州分公司的子集id
                 List<String> ids = baseMapper.getIds(userDTO.getCompanyDTO().getId());
                 ids.add(userDTO.getCompanyDTO().getId());
                 queryWrapper.in ( "a.id", ids );