1.修改权限问题

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.wd.workoffice"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 4
+        versionName "1.0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
                 JPUSH_PKGNAME: applicationId,

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceActivity.java

@@ -51,7 +51,8 @@ public class DeviceActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.rl_device:
-                if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_LIST.getPermission()) && WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_LIST.getPermission())) {
+                if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_LIST.getPermission()) &&
+                        !WorkUtils.hasPermission(PagePermissionType.SPARE_PART_LIST.getPermission())) {
                     toast(R.string.permission);
                     return;
                 }

app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java

@@ -179,7 +179,7 @@ public class WorkFragment extends WorkBaseFg {
 //                        "库存类别", "订单"};
                 switch (position) {
                     case 0:
-                        if (!WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission())){
+                        if (!WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission())) {
                             toast(R.string.permission);
                             return;
                         }
@@ -196,6 +196,12 @@ public class WorkFragment extends WorkBaseFg {
 //                        startActivity(WorkAccountActivity.class);
 //                        break;
                     case 2:
+                        if (!WorkUtils.hasPermission(PagePermissionType.STOCK_PAGE.getPermission())
+                                && !WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER_PAGE.getPermission()) &&
+                                !WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_PAGE.getPermission())) {
+                            toast(R.string.permission);
+                            return;
+                        }
                         startActivity(WorkWarehouseActivity.class);
                         break;
                     case 3:
@@ -218,7 +224,7 @@ public class WorkFragment extends WorkBaseFg {
 //                        toast("暂无数据");
 //                        break;
                     case 6:
-                        if (!WorkUtils.hasPermission(PagePermissionType.STOCK_TYPE_LIST.getPermission())){
+                        if (!WorkUtils.hasPermission(PagePermissionType.STOCK_TYPE_LIST.getPermission())) {
                             toast(R.string.permission);
                             return;
                         }