Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client_h5/src/pages/assetMy/index.vue

@@ -15,6 +15,9 @@
             </card-cell>
           </van-swipe-cell>
         </div>
+        <div v-if="list.length == 0">
+          <p style="text-align: center; color: #a58a8a">暂无固定资产</p>
+        </div>
       </template>
     </card>
   </flow-form>

zjugis-business/src/main/resources/mapper/oracle/AssetProcureDetailMapper.xml

@@ -116,9 +116,9 @@
         LEFT JOIN ASSET_PROCURE T1 ON T.ASSET_ID=T1.ID
         LEFT JOIN PROJECT T2 ON T1.PROJECT_ID=T2.ID
         <where>
-            T.ISVALID = 1 and T1.ISVALID = 1 AND T1.PROCURE_TYPE in (1,3) AND T1.FLOW_STATUS=90
+            T.ISVALID = 1 and T1.ISVALID = 1  AND T1.FLOW_STATUS=90
             <if test="params != null and params.userId != null and params.userId != ''">
-                AND T1.USER_ID = #{params.userId}
+                AND T.CUSTODIAN = #{params.userId}
             </if>
         </where>
         ORDER BY