Pārlūkot izejas kodu

角色信息新增总裁与总裁助理(12=总裁助理,13=总裁)
订单详情查看逻辑限制(超级管理员与本人可查询)

anderx 3 gadi atpakaļ
vecāks
revīzija
49ce61ea16

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

@@ -21,7 +21,7 @@ public class AFTConstants {
 	public static final String	APPROVAL_DECISION_AUDITOR			= "99989";
 	/**	总裁 */
 	public static final String	CED									= "99998";
-	/**	总裁助 */
+	/**	总裁助 */
 	public static final String	CED_ASSISTANT						= "99988";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";

+ 3 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -152,7 +152,7 @@ public class BaseController {
 	/**
 	 *	获取权利列表
 	 * @return String  返回权限列表 逗号隔开 1=营销员,2=营销经理,3=营销管理员,4=营销总监,5=财务专员,6=财务经理,7=财务管理员,
-	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理
+	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理,12=总裁助理,13=总裁
 	 */
 	public String shiroAddRedis() {
 		redisUtil.deleteString("shiroList");
@@ -168,6 +168,8 @@ public class BaseController {
 		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
 		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str=str.append(12).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
 		if (str.length()<1)return "";
 		String shiroList=str.substring(0,str.length()-1);
 		redisUtil.setString("shiroList",shiroList);

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -620,6 +620,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
 		String url=pushOrderService.processStatusConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus());
 		tOrder.setContractPictureUrl(url);
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			if (!tOrder.getSalesmanId().equals(TokenManager.getAdminId())){
+				tOrder.setContacts("***");
+				tOrder.setContactMobile("***");
+				tOrder.setLegalPerson("***");
+				tOrder.setLegalPersonTel("***");
+			}
+		}
 		return tOrder;
 	}