bug 2159 2158 2148 修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanSubVo.java

@@ -38,6 +38,9 @@ public class LabRiskPlanSubVo {
     @ApiModelProperty(name = "实验室ids")
     private String subjectIds;
 
+    @ApiModelProperty(name = "当前用户id")
+    private Long userId;
+
 //    @ApiModelProperty(name = "传感器类型字符串")
 //    private String types;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -1961,6 +1961,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     public Page<LabSubjectVO> getLabRiskPlanNoJoinSub(LabRiskPlanSubVo labRiskPlanSubVo) {
 //        String typeIds = getSensorTypesByRiskPlanId(labRiskPlanSubVo.getRiskPlanId());
 //        labRiskPlanSubVo.setTypes(typeIds);
+        labRiskPlanSubVo.setUserId(tokenService.getLoginUser().getUserid());
         Page<LabSubjectVO> labSubjectVOS = labRiskPlanMapper.getLabRiskPlanNoJoinSub(new Page<LabSubjectVO>(labRiskPlanSubVo.getPageNum(), labRiskPlanSubVo.getPageSize()), labRiskPlanSubVo);
         if (labSubjectVOS.getRecords().size() > 0) {
             for (LabSubjectVO labSubjectVO : labSubjectVOS.getRecords()) {

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanMapper.xml

@@ -468,8 +468,8 @@
                 and (name like concat('%', #{riskPlanVo.searchValue}, '%')
                     or create_by like concat('%', #{riskPlanVo.searchValue}, '%'))
             </if>
-            <if test="riskPlanVo.startCondition != null">
-                and start_condition = #{riskPlanVo.startCondition}
+            <if test="riskPlanVo.startCondition != null and riskPlanVo.startCondition != ''">
+                and start_condition like concat('%', #{riskPlanVo.startCondition}, '%')
             </if>
         </where>
         order by create_time desc
@@ -489,7 +489,7 @@
                 and lrp.risk_plan_id = #{labRiskPlanSubVo.riskPlanId}
             </if>
             <if test="labRiskPlanSubVo.searchValue != null and labRiskPlanSubVo.searchValue != ''">
-                and ls.name = like concat('%', #{labRiskPlanSubVo.searchValue}, '%')
+                and ls.name like concat('%', #{labRiskPlanSubVo.searchValue}, '%')
             </if>
             <if test="labRiskPlanSubVo.level != null">
                 and ls.level = #{labRiskPlanSubVo.level}
@@ -520,11 +520,14 @@
                                                     LEFT JOIN lab_risk_plan_sensor_relation lrps on lrp.id = lrps.risk_plan_id
                                        where lrp.id = #{labRiskPlanSubVo.riskPlanId})
             </if>
+            <if test="labRiskPlanSubVo.userId != null">
+                and FIND_IN_SET (#{labRiskPlanSubVo.userId},ls.safe_user_id)
+            </if>
             <if test="labRiskPlanSubVo.searchValue != null and labRiskPlanSubVo.searchValue != ''">
-                and ls.name = like concat('%', #{labRiskPlanSubVo.searchValue}, '%')
+                and ls.name like concat('%', #{labRiskPlanSubVo.searchValue}, '%')
             </if>
             <if test="labRiskPlanSubVo.level != null">
-                #{labRiskPlanSubVo.level}
+                and ls.level = #{labRiskPlanSubVo.level}
             </if>
             <if test="labRiskPlanSubVo.typeId != null">
                 and ls.type_id = #{labRiskPlanSubVo.typeId}