优化查询员工条件

WebService/src/main/resources/components/staffPackage/staff-manage/staff.js

@@ -28,6 +28,8 @@
                        vc.component._getOrgsByOrgLevelStaff(DEFAULT_PAGE, DEFAULT_ROWS,3,val);
 
                        vc.component.staffInfo.conditions.branchOrgId = val;
+                       vc.component.staffInfo.conditions.parentOrgId = val;
+
 
                        vc.component.staffInfo.conditions.departmentOrgId = '';
 

java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -461,6 +461,9 @@
         <if test="staffId != null and staffId !=''">
             and uosr.staff_id = #{staffId}
         </if>
+        <if test="orgId !=null and orgId != ''">
+            and uo.org_id = #{orgId}
+        </if>
     </select>
 
     <!-- 查询员工总量 -->
@@ -493,6 +496,9 @@
         <if test="staffId != null and staffId !=''">
             and uosr.staff_id = #{staffId}
         </if>
+        <if test="orgId !=null and orgId != ''">
+            and uo.org_id = #{orgId}
+        </if>
         order by u.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}