用户系统服务优化

cloud-system/src/main/java/com/yizhi/system/application/service/impl/AccountServiceImpl.java

@@ -1343,22 +1343,22 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     }
     }
 
 
     @Override
     @Override
-    public Page<Account> orgAccountListPage(Long companyId, List<RightLeftIndex> rightLeftIndices, String name, String mobile,
+    public Page<Account> orgAccountListPage(Long companyId, List<RightLeftIndex> rightLeftIndices, String name, String mobile,Long orgId,
                                             String workNum, String fullName, String email,
                                             String workNum, String fullName, String email,
                                             Integer enabled, Integer pageNo, Integer pageSize) {
                                             Integer enabled, Integer pageNo, Integer pageSize) {
         Page<Account> page = new Page<>(pageNo, pageSize);
         Page<Account> page = new Page<>(pageNo, pageSize);
-        page.setRecords(accountMapper.orgAccountListPage(rightLeftIndices, name, mobile, workNum, fullName,
+        page.setRecords(accountMapper.orgAccountListPage(rightLeftIndices, name, mobile,orgId, workNum, fullName,
                 email, enabled, companyId, new RowBounds(page.getOffset(), page.getLimit())));
                 email, enabled, companyId, new RowBounds(page.getOffset(), page.getLimit())));
         page.setTotal(accountMapper.orgAccountListPageCount(rightLeftIndices, name, mobile, workNum, fullName, email, enabled, companyId));
         page.setTotal(accountMapper.orgAccountListPageCount(rightLeftIndices, name, mobile, workNum, fullName, email, enabled, companyId));
 
 
         return page;
         return page;
     }
     }
     @Override
     @Override
-    public Page<Account> orgAccountListById(Long companyId, List<RightLeftIndex> rightLeftIndices, String name, String mobile,
+    public Page<Account> orgAccountListById(Long companyId, List<RightLeftIndex> rightLeftIndices, String name, String mobile,Long orgId,
                                             String workNum, String fullName, String email,
                                             String workNum, String fullName, String email,
                                             Integer enabled, Integer pageNo, Integer pageSize) {
                                             Integer enabled, Integer pageNo, Integer pageSize) {
         Page<Account> page = new Page<>(pageNo, pageSize);
         Page<Account> page = new Page<>(pageNo, pageSize);
-        page.setRecords(accountMapper.orgAccountListPage(rightLeftIndices, name, mobile, workNum, fullName,
+        page.setRecords(accountMapper.orgAccountListPage(rightLeftIndices, name, mobile, orgId,workNum, fullName,
                 email, enabled, companyId, new RowBounds(page.getOffset(), page.getLimit())));
                 email, enabled, companyId, new RowBounds(page.getOffset(), page.getLimit())));
 
 
         return page;
         return page;

cloud-system/src/main/resources/mybatis/AccountMapper.xml

@@ -274,6 +274,9 @@
         <if test="email != null and email != ''">
         <if test="email != null and email != ''">
             AND a.email LIKE concat('%', #{email}, '%')
             AND a.email LIKE concat('%', #{email}, '%')
         </if>
         </if>
+        <if test="orgId != null and orgId != ''">
+            AND a.org_id = #{orgId}
+        </if>
         <if test="enabled != null">
         <if test="enabled != null">
             AND a.enabled = #{enabled}
             AND a.enabled = #{enabled}
         </if>
         </if>