过滤已离职员工&&个贷财务开票

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -335,7 +335,8 @@
             p.created,
             o.real_amount,
             o.should_amount,
-            p.save_file_date
+            p.save_file_date,
+            o.id as orderFundId
         from
             personal p
                 LEFT JOIN personal_target pt ON pt.personal_id =  p.id
@@ -345,7 +346,7 @@
                 LEFT JOIN user u1 ON u1.id = p.outward_staff
                 LEFT JOIN user u2 ON u2.id = p.inward_staff
                 LEFT JOIN user u3 ON u3.id = p.pricing_staff
-                left join (select business_id,real_amount,should_amount from order_fund where business_type='PERSONAL_BUSINESS' and deleted = 0) o on o.business_id = p.id
+                left join (select id,business_id,real_amount,should_amount from order_fund where business_type='PERSONAL_BUSINESS' and deleted = 0) o on o.business_id = p.id
         where
             p.deleted = 0  and p.client_manager_id = #{personal.clientManagerId}
         <if test="keyword!=null and keyword!='' ">

dao/src/main/resources/mapper/UserMapper.xml

@@ -126,6 +126,7 @@
           AND p.deleted = 0
           AND up.deleted = 0
           and u.deleted =0
+            and resign_state = 0
             order by u.id
     </select>
 

domain/src/main/java/com/dayou/vo/PersonalVO.java

@@ -143,4 +143,6 @@ public class PersonalVO extends Personal {
     private String nodeCode;
 
     private String comments;
+
+    private Long orderFundId;
 }