From 6162f1482ad20fe5bfde1da5163a432dcf9acdcd Mon Sep 17 00:00:00 2001 From: wenfei Date: Mon, 10 Nov 2025 18:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=B8=90=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/activity/sbxdjgl/SbxdjglActivity.java | 12 ++++++---- .../ui/activity/sbxdjgl/XzjhFragment.java | 24 ++++++++++++------- .../dywoa/ui/fragment/HomeFragment.java | 4 ++-- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java index aaf764e..f889150 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java @@ -162,10 +162,14 @@ public class SbxdjglActivity extends BaseActivity2 { if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ - param.put("firstDeparment", firstDeparment); - param.put("secondDeparment", secondDeparment); - param.put("firstDeparmentId", firstDeparmentId); - param.put("secondDeparmentId", secondDeparmentId); + if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ + showLog("RH00002 test account"); + }else{ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java index b0128b2..66e6324 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java @@ -290,10 +290,14 @@ public class XzjhFragment extends BaseFragment { if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ - param.put("firstDeparment", firstDeparment); - param.put("secondDeparment", secondDeparment); - param.put("firstDeparmentId", firstDeparmentId); - param.put("secondDeparmentId", secondDeparmentId); + if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ + showLog("RH00002 test account"); + }else{ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } } } @@ -670,10 +674,14 @@ public class XzjhFragment extends BaseFragment { if(!TextUtils.isEmpty(firstDeparment)){ if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ - param.put("firstDeparment", firstDeparment); - param.put("secondDeparment", secondDeparment); - param.put("firstDeparmentId", firstDeparmentId); - param.put("secondDeparmentId", secondDeparmentId); + if(username!=null&&username.equals("RH00002")&&firstDeparment.equals("承包商")){ + showLog("RH00002 test account"); + }else{ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java index 619039e..eab9d62 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java @@ -333,7 +333,7 @@ public class HomeFragment extends BaseFragment { break; case 4: //巡检 - if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00001"))||(username!=null&&username.equals("RH00020"))){ + if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00002"))||(username!=null&&username.equals("RH00020"))){ Intent intentXj= new Intent(mActivity, XscbglActivity.class); intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intentXj); @@ -343,7 +343,7 @@ public class HomeFragment extends BaseFragment { break; case 5: //点检 - if((firstDeparment!=null&&firstDeparment.equals("设备部"))||(firstDeparment!=null&&firstDeparment.equals("粤电服大亚湾项目部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00001"))||(username!=null&&username.equals("RH00020"))){ + if((firstDeparment!=null&&firstDeparment.equals("设备部"))||(firstDeparment!=null&&firstDeparment.equals("粤电服大亚湾项目部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00002"))||(username!=null&&username.equals("RH00020"))){ Intent intentDj= new Intent(mActivity, SbxdjglActivity.class); intentDj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentDj.putExtra("edit",false);