xuxiaofei %!s(int64=3) %!d(string=hai) anos
pai
achega
0eb02360f3

+ 2 - 0
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpQualificationApplyManageController.java

@@ -197,6 +197,8 @@ public class QpQualificationApplyManageController extends BaseController
             QpFlowDetail flowDetail = qpFlowDetailService.selectZgCenterByUserIdIs(sysUser.getUserId());
             if(flowDetail==null){
                 audit=false;
+            }else{
+                audit=true;
             }
         }
         map.put("isAdmin",isAdmin);

+ 2 - 0
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpUsegasApplyManageController.java

@@ -177,6 +177,8 @@ public class QpUsegasApplyManageController extends BaseController
             QpFlowDetail flowDetail = qpFlowDetailService.selectYqCenterByUserIdIs(sysUser.getUserId());
             if(flowDetail==null){
                 audit=false;
+            }else{
+                audit=true;
             }
         }
         map.put("isAdmin",isAdmin);

+ 3 - 3
zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSecurityApplyMapper.xml

@@ -577,12 +577,12 @@
             a.valid_end_time >= str_to_date(#{endTime}, '%Y-%m-%d')
             )
         </if>
-        and  a.valid_end_time >= now()
+        and  a.valid_end_time &gt;= now()
 
     </select>
     <select id="selectApplyListBySubIds" resultType="java.util.Map">
         select subject_id as subId, user_id as userId from lab_security_apply a
-        where a.audit_status = 2 and a.valid_end_time >= now()
+        where a.audit_status = 2 and a.valid_end_time &gt;= now()
         <if test="subIds!=null and subIds.size > 0">
             and a.subject_id in
             <foreach item="subId" collection="subIds" separator="," open="(" close=")">
@@ -594,7 +594,7 @@
     <!--未过期的申请 -->
     <select id="selectValidApply" parameterType="com.zd.laboratory.domain.LabSecurityApply" resultMap="LabSecurityApplyResult">
         <include refid="selectLabSecurityApplyVo"/>
-        where t.audit_status = 2 and t.valid_end_time >= now()
+        where t.audit_status = 2 and t.valid_end_time &gt;= now()
         <if test="userId!=null">
             and t.user_id=#{userId}
         </if>