Merge remote-tracking branch 'origin/master'

wms/src/main/java/com/yxt/wms/biz/func/commonmethod/CommonMethod.java

@@ -0,0 +1,54 @@
+package com.yxt.wms.biz.func.commonmethod;
+
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/11 10:35
+ */
+@Service
+public class CommonMethod {
+    @Autowired
+    SysUserFeign sysUserFeign;
+
+    /**
+     * 根据参数组装新的数据权限参数
+     * @param orgPath
+     * @param menuUrl
+     * @param userSid
+     * @return
+     */
+    public ResultBean<DataRule> dataRule (String orgPath,String menuUrl,String userSid){
+        ResultBean rb=new ResultBean().fail();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(orgPath);
+        privilegeQuery.setMenuUrl(menuUrl);
+        privilegeQuery.setUserSid(userSid);
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        DataRule dataRule=new DataRule();
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1全部、2、本部门及子部门 3子部门、4本人数据)
+            String orgSidPath = orgPath;
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+//            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            dataRule.setDataRuleId(orgLevelKey);
+            if ("1".equals(orgLevelKey)) {
+                dataRule.setIndex(i1);
+            } else if ("2".equals(orgLevelKey)) {
+                dataRule.setIndex(i2);
+            } else if ("3".equals(orgLevelKey)) {
+                dataRule.setIndex(i2);
+            }
+        }
+        return rb.success().setData(dataRule);
+    }
+}

wms/src/main/java/com/yxt/wms/biz/func/commonmethod/DataRule.java

@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.func.commonmethod;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/11 10:54
+ */
+@Data
+public class DataRule {
+    private String dataRuleId;
+    private int index;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaQuery.java

@@ -16,7 +16,8 @@ public class WarehouseAreaQuery implements Query {
     private String code;//编码
     private String warehouseSid;//仓库
     private String areaTypeSid;//库区类型
-    private String orgLevelKey;//
+    private String orgLevelKey;//数据权限
+    private int index;//下标
 
     @ApiModelProperty("菜单路由")
     private String menuUrl;

wms/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java

@@ -8,6 +8,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
@@ -35,15 +37,16 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
+    @Autowired
+    CommonMethod commonMethod;
     public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaQuery query = pq.getParams();
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-        privilegeQuery.setOrgPath(query.getOrgPath());
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        privilegeQuery.setUserSid(query.getUserSid());
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        pq.getParams().setIndex(dataRule.getIndex());
-        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
         PagerVo<WarehouseAreaVo> p = warehouseAreaFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }

wms/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java

@@ -13,11 +13,12 @@ import lombok.Data;
 @Data
 public class WarehouseAreaTypeQuery implements Query {
     private String name;
-    private String orgLevelKey;//
+    private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")
     private String menuUrl;
     @ApiModelProperty("组织全路径sid")
     private String orgPath;
     @ApiModelProperty("用户sid")
     private String userSid;
+    private int index;//下标
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java

@@ -8,6 +8,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfo;
 import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfoQuery;
@@ -39,15 +41,15 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
+    @Autowired
+    CommonMethod commonMethod;
     public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaTypeQuery query = pq.getParams();
-        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-        privilegeQuery.setOrgPath(query.getOrgPath());
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-        privilegeQuery.setUserSid(query.getUserSid());
+        pq.getParams().setIndex(dataRule.getIndex());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
         PagerVo<WarehouseAreaTypeVo> p = warehouseAreaTypeFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoQuery.java

@@ -16,12 +16,13 @@ public class WarehouseInfoQuery implements Query {
     private String name;
     private String code;
     private String address;
-    private String orgLevelKey;//
+    private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")
     private String menuUrl;
     @ApiModelProperty("组织全路径sid")
     private String orgPath;
     @ApiModelProperty("用户sid")
     private String userSid;
+    private int index;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -8,6 +8,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
@@ -36,16 +38,16 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseInfoQuery query = pq.getParams();
-        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-        privilegeQuery.setOrgPath(query.getOrgPath());
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-        privilegeQuery.setUserSid(query.getUserSid());
+        pq.getParams().setIndex(dataRule.getIndex());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
         PagerVo<WarehouseInfoVo> p = WarehouseFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackQuery.java

@@ -22,5 +22,6 @@ public class WarehouseRackQuery implements Query {
     private String orgPath;
     @ApiModelProperty("用户sid")
     private String userSid;
-    private String orgLevelKey;//
+    private String orgLevelKey;//权限等级
+    private int index;//下标
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -8,6 +8,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
@@ -35,21 +37,20 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<WarehouseRackVo>> listPage(PagerQuery<WarehouseRackQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseRackQuery query = pq.getParams();
-        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-        privilegeQuery.setOrgPath(query.getOrgPath());
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-        privilegeQuery.setUserSid(query.getUserSid());
+        pq.getParams().setIndex(dataRule.getIndex());
-        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
         PagerVo<WarehouseRackVo> p = warehouseRackFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<WarehouseRackVo> getAllType() {
-
         return warehouseRackFeign.getAllType();
     }