kangwei ：解决权限问题

@@ -105,15 +105,7 @@ public class DangerInspectionRecordController {
 		return result;
 		return result;
 	}
 	}
 
 
-	/**
-	 * <pre>
-	 * 	添加
-	 * </pre>
-	 * @param dangerInspectionRecord
-	 * @return
-	 * @author 开发者姓名, 开发时间
-	 * @Description: TODO(这里描述这个方法的需求变更情况)
-	 */
+
 	@AutoLog(value = "巡检记录-添加")
 	@AutoLog(value = "巡检记录-添加")
 	@ApiOperation(value="巡检记录-添加", notes="巡检记录-添加")
 	@ApiOperation(value="巡检记录-添加", notes="巡检记录-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")

@@ -82,9 +82,7 @@ public class APPDangerInspectionRecordController {
         if(StringUtils.isNotBlank(dangerInspectionRecord.getStatus())){
         if(StringUtils.isNotBlank(dangerInspectionRecord.getStatus())){
             queryWrapper.eq("status", dangerInspectionRecord.getStatus() ) ;
             queryWrapper.eq("status", dangerInspectionRecord.getStatus() ) ;
         }
         }
-        if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
-            queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
-        }
+
        // queryWrapper.eq("report_user", BaseContextHandler.getUserId());
        // queryWrapper.eq("report_user", BaseContextHandler.getUserId());
         IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper);
         IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);
@@ -130,4 +128,4 @@ public class APPDangerInspectionRecordController {
         result.setSuccess(true);
         result.setSuccess(true);
         return result;
         return result;
     }
     }
-}
\ No newline at end of file
+}

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.List;
 import java.util.List;
@@ -56,6 +57,19 @@ public class DangerInspectionRecordVO {
     @ApiModelProperty(value = "条件：结束时间")
     @ApiModelProperty(value = "条件：结束时间")
     private String endTime;
     private String endTime;
 
 
+    public String getStartTime() {
+        if(StringUtils.isNotEmpty(startTime)){
+            startTime = startTime+" 00:00:00";
+        }
+        return startTime;
+    }
+
+    public String getEndTime() {
+        if(StringUtils.isNotEmpty(endTime)){
+            endTime = endTime+" 23:59:59";
+        }
+        return endTime;
+    }
 
 
     @TableField(exist=false)
     @TableField(exist=false)
     @ApiModelProperty(value = "巡检对象集合")
     @ApiModelProperty(value = "巡检对象集合")

@@ -87,6 +87,11 @@ public class MybatisInterceptor implements Interceptor {
         //用户试卷
         //用户试卷
         add("edu_user_paper");
         add("edu_user_paper");
         add("edu_paper");
         add("edu_paper");
+        //采购药剂物料
+        add("erp_purchase_plan_item");
+        add("erp_purchase_material");
+        add("erp_distribut_material");
+
 
 
     }};
     }};
 
 
@@ -111,6 +116,7 @@ public class MybatisInterceptor implements Interceptor {
             if ("1".equals(BaseContextHandler.get("userType"))) {
             if ("1".equals(BaseContextHandler.get("userType"))) {
                 return invocation.proceed();
                 return invocation.proceed();
             }
             }
+            System.out.println("********************************sqlId*************************** : "+sqlId);
             //这些方法不涉及权限
             //这些方法不涉及权限
             if ("com.skua.modules.system.mapper.SysDepartMapper.getDepartTreeByJt".equalsIgnoreCase(sqlId)
             if ("com.skua.modules.system.mapper.SysDepartMapper.getDepartTreeByJt".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysDepartMapper.getDepartTree".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysDepartMapper.getDepartTree".equalsIgnoreCase(sqlId)
@@ -126,7 +132,18 @@ public class MybatisInterceptor implements Interceptor {
                     || "com.skua.modules.system.mapper.SysDepartMapper.queryUserDeparts".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysDepartMapper.queryUserDeparts".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId)
                     || "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId)
                     || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectPageByOut".equals(sqlId)
                     || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectPageByOut".equals(sqlId)
-                    || "com.skua.modules.product.equipRemoteControl.mapper.RemoteControlMapper.queryEquipListDetail".equals(sqlId)) {
+                    || "com.skua.modules.product.equipRemoteControl.mapper.RemoteControlMapper.queryEquipListDetail".equals(sqlId)
+
+                    || "com.skua.modules.erp.mapper.PurchasePlanMapper.statisticsPage".equals(sqlId) //采购计划统计
+                    || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryMaterialByGoodCode".equals(sqlId) //采购合同根据code查询
+                    || "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划
+                    || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
+                    || "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同
+                   /* || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
+                    || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同*/
+
+
+            ) {
                 return invocation.proceed();
                 return invocation.proceed();
             }
             }
             Object[] args = invocation.getArgs();
             Object[] args = invocation.getArgs();