1.修改权限问题

app/src/main/java/com/wd/workoffice/app/Config.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public interface Config {
-    Boolean DEBUG = false;
+    Boolean DEBUG = true;
 
     String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
     String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";

app/src/main/java/com/wd/workoffice/ui/activity/mes/MesUserFileListActivity.java

 package com.wd.workoffice.ui.activity.mes;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -87,8 +88,13 @@ public class MesUserFileListActivity extends WorkToolBarActivity {
         paramMap.put("isCustomerArchives", "1");
         getData();
     }
+
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","历史档案查询")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "历史档案查询");
+        if (TextUtils.isEmpty(mesMenuId)) {
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -110,6 +116,7 @@ public class MesUserFileListActivity extends WorkToolBarActivity {
             }
         });
     }
+
     private void getData() {
         getButtonPermission();
         RtfUtils.getMesRtf().userDataList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@@ -169,7 +176,7 @@ public class MesUserFileListActivity extends WorkToolBarActivity {
                 startActivity(MesUserDataDetailActivity.class, "from", "1", "id",
                         dataList.get(position).getId(), "status",
                         dataList.get(position).getApprovalStatus() + "",
-                        "permission",permission.toJSONString());
+                        "permission", permission == null ? "" : permission.toJSONString());
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryActivity.java

 package com.wd.workoffice.ui.activity.mes.history;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -83,7 +84,11 @@ public class HistoryActivity extends WorkToolBarActivity {
         getData();
     }
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","历史档案查询")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "历史档案查询");
+        if (TextUtils.isEmpty(mesMenuId)){
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -166,7 +171,7 @@ public class HistoryActivity extends WorkToolBarActivity {
                         "feedback", dataList.get(position).getFeedbackInfoNo(),
                         "version", dataList.get(position).getMsVersion(),
                         "status", dataList.get(position).getApprovalStatus()+"",
-                        "permission",permission.toJSONString());
+                        "permission",permission == null ? "" :permission.toJSONString());
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAboutDeptActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -97,6 +98,11 @@ public class MesQualityAboutDeptActivity extends WorkToolBarActivity {
         param.put("factoryImplement",tvFactoryStatus.getText().toString());
         param.put("treatRectPlan",tvFactorySuggest.getText().toString());
         param.put("verifyUserDate",TimeUtils.getNowString());
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "质量反馈");
+        if (TextUtils.isEmpty(mesMenuId)){
+            toast("您没有权限哦");
+            return;
+        }
         RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java

@@ -126,7 +126,11 @@ public class MesQualityActivity extends WorkToolBarActivity {
     }
 
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","质量反馈")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "质量反馈");
+        if (TextUtils.isEmpty(mesMenuId)){
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -173,9 +177,9 @@ public class MesQualityActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 if (TextUtils.equals(dataList.get(position).getStatus(), "1")) {
-                    startActivity(MesQualityAddActivity.class, "data", JSON.toJSONString(dataList.get(position)),"permission",permission.toJSONString());
+                    startActivity(MesQualityAddActivity.class, "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
                 } else {
-                    startActivity(MesQualityDetailActivity.class, "id", dataList.get(position).getId() + "","permission",permission.toJSONString());
+                    startActivity(MesQualityDetailActivity.class, "id", dataList.get(position).getId() + "","permission",permission == null ? "" :permission.toJSONString());
                 }
             }
         });
@@ -205,7 +209,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_add)
     public void onViewClicked() {
-        startActivity(MesQualityAddActivity.class, "permission",permission.toJSONString());
+        startActivity(MesQualityAddActivity.class, "permission",permission == null ? "" :permission.toJSONString());
 
     }
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java

@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -67,7 +68,11 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
         param.put("rapidResponse", tvClientStatus.getText().toString());
         param.put("customerResponse", tvClientReply.getText().toString());
 //        param.put("relatedRecord",tvClientRecord.getText().toString());
-
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "质量反馈");
+        if (TextUtils.isEmpty(mesMenuId)){
+            toast("您没有权限哦");
+            return;
+        }
         RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDeptActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -66,6 +67,11 @@ public class MesQualityDeptActivity extends WorkToolBarActivity {
         param.put("factoryAnalysis", tvDesc.getText().toString());
         param.put("responsibleQualityId", UserKeeper.getInstance().getMesUid());
         param.put("responsibleQualityDate", TimeUtils.getNowString());
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "质量反馈");
+        if (TextUtils.isEmpty(mesMenuId)){
+            toast("您没有权限哦");
+            return;
+        }
         RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchActivity.java

 package com.wd.workoffice.ui.activity.mes.search;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -73,7 +74,11 @@ public class MesSearchActivity extends WorkToolBarActivity {
     }
 
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务", "质量反馈")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "关联查询");
+        if (TextUtils.isEmpty(mesMenuId)){
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
             @Override
             public void doOnSubscribe(Disposable d) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java

@@ -72,7 +72,11 @@ public class MesTicketListActivity extends WorkToolBarActivity {
     }
 
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","服务工单")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "服务工单");
+        if (TextUtils.isEmpty(mesMenuId)){
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -172,16 +176,16 @@ public class MesTicketListActivity extends WorkToolBarActivity {
                         break;
                     case 1:
                         startActivity(MesTicketDetailActivity.class,
-                                "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission.toJSONString());
+                                "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
                         break;
                     case 2:
-                        startActivity(MesTicketDetailActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission.toJSONString());
+                        startActivity(MesTicketDetailActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
                         break;
                     case 3:
-                        startActivity(MesTicketDetailFinishActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission.toJSONString());
+                        startActivity(MesTicketDetailFinishActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
                         break;
                     case 4:
-                        startActivity(MesTicketDetailReviewActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission.toJSONString());
+                        startActivity(MesTicketDetailReviewActivity.class, "from", isJob ? "1" : "0", "data", JSON.toJSONString(dataList.get(position)),"permission",permission == null ? "" :permission.toJSONString());
                         break;
                 }
             }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java

@@ -81,8 +81,13 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
         param.put("pageNum", page);
         getData();
     }
+
     private void getButtonPermission() {
-        RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","用户数据采集")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        String mesMenuId = WorkUtils.getMesMenuId("市场服务", "用户数据采集");
+        if (TextUtils.isEmpty(mesMenuId)){
+            return;
+        }
+        RtfUtils.getMesRtf().buttonPermission(mesMenuId).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -107,6 +112,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
             }
         });
     }
+
     private void getData() {
         getButtonPermission();
         RtfUtils.getMesRtf().userDataList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@@ -163,9 +169,9 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
 //                boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getApprovalUserId());
-                startActivity(MesUserDataDetailActivity.class,"from","1","id",
-                        dataList.get(position).getId(),"status",
-                        dataList.get(position).getApprovalStatus()+"","permission",permission.toJSONString());
+                startActivity(MesUserDataDetailActivity.class, "from", "1", "id",
+                        dataList.get(position).getId(), "status",
+                        dataList.get(position).getApprovalStatus() + "", "permission", permission == null ? "" : permission.toJSONString());
             }
         });
     }
@@ -197,12 +203,13 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 10001 && resultCode == 10001) {
             String returnParam = data.getStringExtra("param");
-            param.put("paramMap", JSON.parseObject(returnParam,Map.class));
+            param.put("paramMap", JSON.parseObject(returnParam, Map.class));
             page = 1;
             param.put("pageNum", page);
             getData();
         }
     }
+
     @OnClick({R.id.tv_go, R.id.btn_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {