优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkCentreMapper.xml

@@ -4,8 +4,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkCentre">
         <id column="id" property="id" />
-        <result column="centreName" property="centreName" />
-        <result column="centreManagerId" property="centre_manager_id" />
+        <result column="centre_name" property="centreName" />
+        <result column="centre-manager_id" property="centreManagerId" />
         <result column="create_time" property="createTime" />
         <result column="modify_time" property="modifyTime" />
     </resultMap>

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -229,7 +229,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         int page = gmpv.getPage() == null ? 1 : gmpv.getPage();
         int pageSize = gmpv.getPageSize() == null ? 10 : gmpv.getPageSize();
         Integer isConclusion = gmpv.getIsConclusion();
-        PageHelper.startPage(page, pageSize);
         List<ManagerProjectsDto> managerProjectsDto;
 
         // 中心负责人
@@ -237,6 +236,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             List<Integer> deptIds = new ArrayList<>();
             WorkCentre workCentre = workCentreMapper.getByManagerId(user.getId());
             HashMap<String, Object> map = new HashMap<>(5);
+            System.out.println(workCentre);
             map.put("centre_id", workCentre.getId());
             List<WorkDept> workDeptList = workDeptMapper.getDeptByCondition(map);
             workDeptList.forEach(workDept -> deptIds.add(workDept.getId()));
@@ -244,6 +244,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, deptIds);
             return returnPageInfo(managerProjectsDto);
         }
+
+        PageHelper.startPage(page, pageSize);
+
         // 部门经理
         if (rank.equals(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
             List<Integer> deptIds = new ArrayList<>();