1

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -551,7 +551,7 @@
             AND ((a.is_dept_audit = 0 and a.project_auditor_id = #{auditorId} and a.project_audit_state = 0)
             or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditorId}))
         </if>
-        <if test="auditUserId != null auditUserId !=''">
+        <if test="auditUserId != null and auditUserId !=''">
             AND ((a.is_dept_audit = 0 and a.project_auditor_id = #{auditUserId} and a.project_audit_state = 0)
             or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditUserId}))
         </if>

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -115,7 +115,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         NumberFormat format = NumberFormat.getPercentInstance();
         format.setMinimumFractionDigits(2);
         queryWrapper.eq(Plan::getCompanyId,companyId);
-        queryWrapper.ne(Plan::getStatus,2);
+        if(isMob!=null&&isMob==1){
+            queryWrapper.ne(Plan::getStatus,2);
+        }
         queryWrapper.eq(Plan::getIsDelete,0);
         if(planType!=2){
             queryWrapper.eq(Plan::getPlanType,0);