改bug

src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import fcb.project.manager.base.dao.TmEstateDao;
+import fcb.project.manager.base.entity.ContextTokenBean;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.enums.DeleteStatus;
+import fcb.project.manager.base.enums.SysUserRoleEnums;
 import fcb.project.manager.base.service.ITmEstateService;
 import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
 import lombok.extern.log4j.Log4j2;
@@ -29,7 +31,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
 
 
 
-    public IPage<TmEstate> getListByNameOrBelong(String estateName , String belongCompany,
+    public IPage<TmEstate> getListByNameOrBelong(String estateName , String belongCompany, ContextTokenBean contextTokenBean,
                                                  Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmEstate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(belongCompany)){
@@ -38,6 +40,16 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
         if(StringUtils.isNotBlank(estateName)){
             lambdaQueryWrapper.like(TmEstate::getEstateName , estateName);
         }
+        if(null != contextTokenBean){
+            if (StringUtils.equals(contextTokenBean.getRoleKey(), SysUserRoleEnums.ADMIN.getRoleKey())
+                    || StringUtils.equals(contextTokenBean.getRoleKey(), SysUserRoleEnums.GROUP.getRoleKey())) {
+                //超级管理员和集团管理员可以看到所有数据
+
+            } else {
+                lambdaQueryWrapper.eq(TmEstate::getBelongCompanyId , contextTokenBean.getDepartmentId());
+            }
+
+        }
         lambdaQueryWrapper.eq(TmEstate::getIsDelete , DeleteStatus.NOT_DELETE.getCode());
         lambdaQueryWrapper.orderByDesc(TmEstate::getCreateTime);
         IPage<TmEstate> page = new Page<>(pageNum , pageSize);

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -63,7 +63,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
                 map.put("id" , contextTokenBean.getDepartmentId());
                 Object userResult = userFeign.getAllChildDeptList(map);
                 log.info("用户模块返回的数据为:{}" , userResult);
-                lambdaQueryWrapper.eq(TmHouse::getBelongCompanyName , contextTokenBean.getDepartmentId());
+                lambdaQueryWrapper.eq(TmHouse::getBelongCompanyId , contextTokenBean.getDepartmentId());
             }
         }
         if (null != status) {
@@ -74,7 +74,14 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         }
         lambdaQueryWrapper.orderByDesc(TmHouse::getCreateTime);
         IPage<TmHouse> page = new Page<>(pageNum, pageSize, true);
-        return getBaseMapper().selectPage(page, lambdaQueryWrapper);
+        IPage<TmHouse> resultPage = getBaseMapper().selectPage(page, lambdaQueryWrapper);
+        if(null != resultPage && resultPage.getTotal() > 0){
+            for (int i = 0; i < resultPage.getRecords().size(); i++) {
+                String vrId = resultPage.getRecords().get(i).getId();
+                resultPage.getRecords().get(i).setCountNum(tmAuditService.countAuditNum(vrId));
+            }
+        }
+        return resultPage;
     }
 
     public IPage<TmHouse> checkEstateCanDelete(String estateId) {
@@ -93,6 +100,7 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         if (StringUtils.isNotBlank(houseTitle)) {
             lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
         }
+        lambdaQueryWrapper.orderByDesc(TmHouse::getSubmitAuditTime);
         if (null != status) {
             if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
                 lambdaQueryWrapper.eq(TmHouse::getStatus, status);

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -156,7 +156,7 @@ public class AuditController extends BaseController{
         }catch (Exception e){
             log.info("调用四维看看微服务出现异常:{}" , e);
         }
-        dbHouse.setStatus(HouseStatus.AUDITED.getCode());
+        dbHouse.setStatus(auditStatus);
         dbHouse.setAuditId(tmAudit.getId());
         dbHouse.setAuditTime(LocalDateTime.now());
         if(null != tokenMap){

src/main/java/fcb/project/manager/core/controller/ProjectController.java

@@ -55,7 +55,7 @@ public class ProjectController extends BaseController {
                                          @RequestParam(name = "pageNum") Long pageNum,
                                          @RequestParam(name = "pageSize") Long pageSize) {
 
-        IPage<TmEstate> resultPage = tmEstateService.getListByNameOrBelong(estateName, belongCompany, pageNum, pageSize);
+        IPage<TmEstate> resultPage = tmEstateService.getListByNameOrBelong(estateName, belongCompany, getContextUserInfo(), pageNum, pageSize);
         return Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
     }

src/main/resources/application.properties

@@ -1,8 +1,8 @@
 
 
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=dev
-spring.profiles.active=test
+#spring.profiles.active=test
 
 #应用名
 spring.application.name=fbc-project-manager