供应商列表查询条件OrgPath字段修改,开票申请列表排序修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -513,16 +513,16 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         BaseDistributorsListQuery params = pagerQuery.getParams();
         QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
         if (params != null) {
-            if (StringUtils.isNotBlank(params.getOrgName())) {
+            String orgPath = "";
-                qw.like("disName", params.getOrgName());
+            if (StringUtils.isBlank(params.getOrgPath())) {
-            }
+                orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
-            if (StringUtils.isNotBlank(params.getOrgPath())) {
+                qw.eq("useOrg", orgPath);
-                qw.eq("useOrg", params.getOrgPath());
             } else {
-                if (StringUtils.isNotBlank(params.getUserSid())) {
+                orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+                qw.eq("useOrg", orgPath);
-                    qw.eq("useOrg", resultBean.getData());
             }
+            if (StringUtils.isNotBlank(params.getOrgName())) {
+                qw.like("disName", params.getOrgName());
             }
         }
         IPage<BaseDistributorsListVo> pagging = baseMapper.getDistributorList(page, qw);
@@ -555,13 +555,13 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         BaseDistributorsQuery params = pagerQuery.getParams();
         QueryWrapper<BaseDistributor> qw = new QueryWrapper<>();
         if (params != null) {
-            if (StringUtils.isNotBlank(params.getOrgPath())) {
+            String orgPath = "";
-                qw.eq("bd.useOrg", params.getOrgPath());
+            if (StringUtils.isBlank(params.getOrgPath())) {
+                orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+                qw.eq("bd.useOrg", orgPath);
             } else {
-                if (StringUtils.isNotBlank(params.getUserSid())) {
+                orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+                qw.eq("bd.useOrg", orgPath);
-                    qw.eq("bd.useOrg", resultBean.getData());
-                }
             }
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("bd.disName", params.getName());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@@ -67,6 +67,7 @@
                 , '%')
             </if>
         </where>
+        order by id desc
     </select>
 
     <update id="updateFlowFiled">