提交代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -62,7 +62,7 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 查询民用工程列表
      */
-    @SaCheckPermission("zdsz:engineeringCivil:list")
+//    @SaCheckPermission("zdsz:engineeringCivil:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringCivilVo> list(ZEngineeringCivilBo bo, PageQuery pageQuery) {
         return iZEngineeringCivilService.queryPageList(bo, pageQuery);
@@ -100,6 +100,8 @@ public class ZEngineeringCivilController extends BaseController {
         return R.ok(iZEngineeringCivilService.queryByEntityBo(zEngineeringCivilBo));
     }
 
+
+
     /**
      * 可视化进度点击房间查历史
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -36,6 +36,7 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 /**
@@ -135,12 +136,18 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo) {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
-        lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
-//        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-//            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId);
-        lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
-//            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId);
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getBuildingId()))
+            lqw.isNull(ZEngineeringCivil::getBuildingId);
+        else
+            lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getUnitId()))
+            lqw.isNull(ZEngineeringCivil::getUnitId);
+        else
+            lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getHouseId()))
+            lqw.isNull(ZEngineeringCivil::getHouseId);
+        else
+            lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -88,8 +88,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
         System.out.println(LoginHelper.getUserType());
         System.out.println(UserType.SYS_USER);
-        if (!LoginHelper.getUserType().equals(UserType.SYS_USER))
-            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
+//        if (!LoginHelper.getUserType().equals(UserType.SYS_USER))
+//            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
         ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
         //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
         if (zEngineeringNode == null) {