Browse Source

订单查看图片权限修改

anderx 2 months ago
parent
commit
c3943402e6

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -61,7 +61,7 @@ public class AFTConstants {
 	/** 运营管理 */
 	public static final String  CALL_MANAGER		            = "9979";
 
-	/** 运营管理 */
+	/** 运营保障 */
 	public static final String  OPERATION_GUARANTEE		            = "9988";
 
 	/**	湖南特批开票*/

+ 10 - 10
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -41,23 +41,23 @@ public class PushOrderService {
                 ||TokenManager.hasRole(AFTConstants.SALESMAN_ASSISTANT))&&
                 Objects.equals(TokenManager.getAdminId(), t.getSalesmanId())){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&& !TokenManager.getAdminId().equals(t.getSalesmanId())){
-            if (TokenManager.getAdminId().equals(t.getManagerId())&&t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
+        }else if (t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
+            if (TokenManager.getAdminId().equals(t.getManagerId())){
                 return  t.getContractPictureUrl();
             }else {
                 return DEFAULTS_URL;
             }
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
+        }else if (t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()&&TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&(t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode())){
+        }else if (t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()&&TokenManager.hasRole(AFTConstants.FINANCE)){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)&&(
-                t.getProcessStatus()== ProcessStatus.YYBZSH.getCode()
-        )){
+        }else if ((t.getProcessStatus()== ProcessStatus.YYBZSH.getCode())&&
+                TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)
+        ){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&(
-                t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()
-        )){
+        }else if ((t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode())&&
+                TokenManager.hasRole(AFTConstants.TECH_ADMIN)
+        ){
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();