buzhanyi 2 anni fa
parent
commit
c4069fa62c

+ 2 - 2
purchase-admin/src/main/resources/application-test.yml

@@ -33,8 +33,8 @@ server:
 # 日志配置
 logging:
   level:
-    com.ozs: debug
-#    com.ozs: ERROR
+#    com.ozs: debug
+    com.ozs: ERROR
     org.springframework: warn
 
 # 用户配置

+ 1 - 1
purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -651,7 +651,7 @@
         <if test="(vo.deptList != null and vo.deptList.size != 0) or (vo.demandIdAll != null and vo.demandIdAll.size != 0)">
             <include refid="deptListOrDemandIdAllNoAnd"/>
         </if>
-        group by year(task_release_time)
+        group by year(task_release_time!=null)
     </select>
 
     <select id="purchaseProjectNumberAnalysisQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"