Merge remote-tracking branch 'origin/develop' into develop

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -64,21 +64,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	 */
 	@Override
 	public IPage<TSalaryAccount> getTSalaryAccountPage(Page<TSalaryAccount> page, TSalaryAccountSearchVo tSalaryAccount) {
-		long pageCount = baseMapper.getTSalaryAccountPageCountDiy(tSalaryAccount);
-		page.setTotal(pageCount);
-		if (pageCount > 0L) {
-			page.setPages((long) Math.ceil(1.0*pageCount / page.getSize()));
-		}
-		if (page.getCurrent() < 1) {
-			page.setCurrent(1L);
-		}
-		if (page.getSize() < 1) {
-			page.setSize(10L);
-		}
-		if (pageCount > ((page.getCurrent() - 1) * page.getSize())) {
-			page.setRecords(baseMapper.getTSalaryAccountPageDiy(tSalaryAccount, (page.getCurrent() - 1) * page.getSize(), page.getSize()));
-		}
-		return page;
+		return baseMapper.getTSalaryAccountPage(page, tSalaryAccount);
 	}
 
 	/**

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -348,9 +348,11 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
         <where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0
+			and not EXISTS (
+				select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="tSalaryAccount_where"/>
 			<if test="tSalaryAccount.authSql != null and tSalaryAccount.authSql.trim() != ''">
 				${tSalaryAccount.authSql}
@@ -578,9 +580,10 @@
 		SELECT
 		<include refid="Base_Column_List"/>
 		FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0 and not EXISTS (
+			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="where_export"/>
 			<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
 				${searchVo.authSql}
@@ -617,9 +620,10 @@
 		SELECT
 		count(1)
 		FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0 and not EXISTS (
+			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="where_export"/>
 			<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
 				${searchVo.authSql}