Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/PtUserAccount.java

@@ -159,7 +159,7 @@ public class PtUserAccount extends TenantEntity {
     private String otherId;
 
     /**
-     * 第三方人员状态
+     * 第三方人员状态 （on-在职，quit-离校，退休-retire，die-去世，register-报到中，failure-不报到）
      */
     private String userState;
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/bo/PtUserAccountBo.java

@@ -214,6 +214,11 @@ public class PtUserAccountBo extends TenantEntity {
      */
     private List<Long> excludeDeptsAndChildren;
 
+    /**
+     * 需要查询的账户状态，比如：userState = on or retire
+     */
+    private List<String> userStateQuery;
+
 
     private Long cardId;
 

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PtUserAccountMapper.xml

@@ -74,6 +74,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="bo.userStateQuery !=null and bo.userStateQuery.size() >0">
+                and u.user_state in
+                <foreach collection="bo.userStateQuery" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by u.dept_id,u.user_id
     </select>