Przeglądaj źródła

公出汇总分角色查看权限开发

anderx 3 lat temu
rodzic
commit
91254efdd1

+ 0 - 5
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -2,7 +2,6 @@ package com.goafanti.admin.service;
 
 
 import com.goafanti.common.model.WorkingHours;
 import com.goafanti.common.model.WorkingHours;
 
 
-import java.util.List;
 
 
 public interface DepartmentService {
 public interface DepartmentService {
 
 
@@ -17,8 +16,4 @@ public interface DepartmentService {
 	boolean checkWorkingHoursType(Integer type);
 	boolean checkWorkingHoursType(Integer type);
 
 
 	boolean checkDepWorkingHouresType(Integer id);
 	boolean checkDepWorkingHouresType(Integer id);
-
-
-	List<?> selectByAidGetDep(String aid);
-
 }
 }

+ 1 - 10
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -2,7 +2,6 @@ package com.goafanti.admin.service.impl;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import com.goafanti.common.dao.OrganizationManagementMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -16,8 +15,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 
 
 	@Autowired
 	@Autowired
 	private WorkingHoursMapper	workingHoursMapper;
 	private WorkingHoursMapper	workingHoursMapper;
-	@Autowired
-	private OrganizationManagementMapper departmentMapper;
+
 
 
 	@Override
 	@Override
 	public int addWorkingHours(WorkingHours in) {
 	public int addWorkingHours(WorkingHours in) {
@@ -57,11 +55,4 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		return false;
 		return false;
 	}
 	}
 
 
-	@Override
-	public List<?> selectByAidGetDep(String aid) {
-		departmentMapper.selectByAidGetDep(aid);
-		return null;
-	}
-
-
 }
 }

+ 17 - 17
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -74,14 +74,14 @@ public interface OrganizationManagementMapper {
 	 * 根据组织名称查组织编号
 	 * 根据组织名称查组织编号
 	 */
 	 */
 	String selectDepNoByName(String name);
 	String selectDepNoByName(String name);
-	
+
 	/**
 	/**
 	 * 根据上级组织查组织编号
 	 * 根据上级组织查组织编号
 	 */
 	 */
 	String  selectDepNo(String id);
 	String  selectDepNo(String id);
 	/**
 	/**
-	
-	
+
+
 	/**
 	/**
 	 * 查询相同上级下编号数量
 	 * 查询相同上级下编号数量
 	 */
 	 */
@@ -90,13 +90,13 @@ public interface OrganizationManagementMapper {
 	 * 模糊查询负责人名称
 	 * 模糊查询负责人名称
 	 */
 	 */
 	List<AdminListBo> selectName(String name);
 	List<AdminListBo> selectName(String name);
-	
+
 	OrganizationListOut selectAllById(String id);
 	OrganizationListOut selectAllById(String id);
-	
+
 	int deleteById(String id);
 	int deleteById(String id);
-	
+
 	String selectAdminNameById(String name);
 	String selectAdminNameById(String name);
-	
+
 	String selectIdByDepNo(String depNo);
 	String selectIdByDepNo(String depNo);
 	/**
 	/**
 	 * 查询有相同上级组织的信息
 	 * 查询有相同上级组织的信息
@@ -104,26 +104,26 @@ public interface OrganizationManagementMapper {
 	 * @return
 	 * @return
 	 */
 	 */
 	List<OrganizationListOut> selectIDNBySuperId(String superId);
 	List<OrganizationListOut> selectIDNBySuperId(String superId);
-	
+
 	int updateByNumber(OrganizationListOut olo);
 	int updateByNumber(OrganizationListOut olo);
-	
+
 	int selectCountBySuperId(String superId);
 	int selectCountBySuperId(String superId);
-	
+
 	String selectIdByName(String name);
 	String selectIdByName(String name);
-	
+
 	String selectNameById(String id);
 	String selectNameById(String id);
-	
+
 	String selectDepNoById(String id);
 	String selectDepNoById(String id);
-	
+
 	int selectUserById(String id);
 	int selectUserById(String id);
-	
+
 	/**
 	/**
 	 * 查询下级集合
 	 * 查询下级集合
 	 * @param superIds
 	 * @param superIds
 	 * @return
 	 * @return
 	 */
 	 */
 	List<OrganizationManagement> selectSubDeps(@Param("superIds")String superIds);
 	List<OrganizationManagement> selectSubDeps(@Param("superIds")String superIds);
-	
+
 	List<depCountBo> selectBysuperId(String id);
 	List<depCountBo> selectBysuperId(String id);
 
 
 	List<depCountBo> selectBysuperName(String name);
 	List<depCountBo> selectBysuperName(String name);
@@ -133,7 +133,7 @@ public interface OrganizationManagementMapper {
 	 * @return
 	 * @return
 	 */
 	 */
 	List<OrganizationManagement> selectCurrentDeps(@Param("aid")String aid);
 	List<OrganizationManagement> selectCurrentDeps(@Param("aid")String aid);
-	
+
 	/**
 	/**
 	 * 查询所有部门
 	 * 查询所有部门
 	 * @return
 	 * @return
@@ -145,7 +145,7 @@ public interface OrganizationManagementMapper {
 	 * @return
 	 * @return
 	 */
 	 */
 	String getMaxAbbreviation(String abbreviation);
 	String getMaxAbbreviation(String abbreviation);
-	
+
 	List<AdminCustomerBo> getDepAll(@Param("depId")String depId,
 	List<AdminCustomerBo> getDepAll(@Param("depId")String depId,
 			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
 			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -610,7 +610,7 @@
 
 
 		<select id="selectBysuperId"  resultType="com.goafanti.admin.bo.depCountBo">
 		<select id="selectBysuperId"  resultType="com.goafanti.admin.bo.depCountBo">
 		select a.id ,a.name ,0 userCount,0 inputCount,0 receiveCount, 0 completeCount, 0 interviewCount
 		select a.id ,a.name ,0 userCount,0 inputCount,0 receiveCount, 0 completeCount, 0 interviewCount
-		from department a left join department b on a.super_id=b.id where b.id= #{id}
+        from department a  where a.super_id= #{id}
 	</select>
 	</select>
 
 
     <select id="selectBysuperName" resultType="com.goafanti.admin.bo.depCountBo">
     <select id="selectBysuperName" resultType="com.goafanti.admin.bo.depCountBo">

+ 38 - 38
src/main/java/com/goafanti/order/service/OrderService.java

@@ -17,7 +17,7 @@ import com.goafanti.order.bo.C2COrderDetailBo;
 import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeBo;
 
 
 public interface OrderService {
 public interface OrderService {
-	
+
 	/**
 	/**
 	 * 查询商品详情
 	 * 查询商品详情
 	 * @param commodityId 商品id
 	 * @param commodityId 商品id
@@ -55,7 +55,7 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateRefundForTest(String orderNo, String refundAmount);
 	int updateRefundForTest(String orderNo, String refundAmount);
-	
+
 	/**
 	/**
 	 * 支付尾款
 	 * 支付尾款
 	 * @param orderNo 订单编号
 	 * @param orderNo 订单编号
@@ -66,7 +66,7 @@ public interface OrderService {
 	int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks);
 	int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks);
 
 
 	/**
 	/**
-	 * 
+	 *
 	 * @param confirm 是否
 	 * @param confirm 是否
 	 * @return
 	 * @return
 	 */
 	 */
@@ -107,9 +107,9 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateConfirmIntention(String orderNo, boolean confirm);
 	int updateConfirmIntention(String orderNo, boolean confirm);
-	
+
 	/**
 	/**
-	 * 
+	 *
 	 * @param bo
 	 * @param bo
 	 * @param startDate 开始时间
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param endDate 结束时间
@@ -117,15 +117,15 @@ public interface OrderService {
 	 * @param formal 是否包含正式
 	 * @param formal 是否包含正式
 	 * @param depId 部门id
 	 * @param depId 部门id
 	 * @param history 是否包含历史
 	 * @param history 是否包含历史
-	 * @param pageNo 
+	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @return
 	 * @return
 	 */
 	 */
 	Pagination<OrderListBo> selectServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
 	Pagination<OrderListBo> selectServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
 			Integer pageNo, Integer pageSize);
 			Integer pageNo, Integer pageSize);
-	
 
 
-	
+
+
 	/**
 	/**
 	 * 服务订单详情
 	 * 服务订单详情
 	 * @param orderNo
 	 * @param orderNo
@@ -145,7 +145,7 @@ public interface OrderService {
 	 */
 	 */
 	int updateServiceOrder(String orderNo, String signFirstPayment,
 	int updateServiceOrder(String orderNo, String signFirstPayment,
 			String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
 			String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
-	
+
 	/**
 	/**
 	 * 签单
 	 * 签单
 	 * @param orderNo
 	 * @param orderNo
@@ -180,7 +180,7 @@ public interface OrderService {
 	 */
 	 */
 	int addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
 	int addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
 			String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks);
 			String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks);
-	
+
 	/**
 	/**
 	 * 修改商品信息
 	 * 修改商品信息
 	 * @param detailId
 	 * @param detailId
@@ -198,15 +198,15 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int deleteOrderCommodity(String detailId);
 	int deleteOrderCommodity(String detailId);
-	
+
 	/**
 	/**
-	 * 查询分管部门
+	 * 查询分管部门、查询管理部门
 	 * @return
 	 * @return
 	 */
 	 */
 	List<OrganizationManagement> selectMyDeps();
 	List<OrganizationManagement> selectMyDeps();
-	
+
 	/**
 	/**
-	 * 
+	 *
 	 * @param bo
 	 * @param bo
 	 * @param startDate 开始时间
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param endDate 结束时间
@@ -214,21 +214,21 @@ public interface OrderService {
 	 * @param formal 是否包含正式
 	 * @param formal 是否包含正式
 	 * @param depIds 部门id
 	 * @param depIds 部门id
 	 * @param history 是否包含历史
 	 * @param history 是否包含历史
-	 * @param pageNo 
+	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @return
 	 * @return
 	 */
 	 */
 	Pagination<OrderListBo> selectDepServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
 	Pagination<OrderListBo> selectDepServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
 			String depIds,Integer pageNo, Integer pageSize);
 			String depIds,Integer pageNo, Integer pageSize);
-	
+
 	/**
 	/**
-	 * 
+	 *
 	 * @param bo
 	 * @param bo
 	 * @param startDate 开始时间
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param endDate 结束时间
 	 * @param depIds 部门id
 	 * @param depIds 部门id
 	 * @param history 是否包含历史
 	 * @param history 是否包含历史
-	 * @param pageNo 
+	 * @param pageNo
 	 * @param pageSize
 	 * @param pageSize
 	 * @return
 	 * @return
 	 */
 	 */
@@ -242,7 +242,7 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	Pagination<OrderListBo> selectPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize);
 	Pagination<OrderListBo> selectPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize);
-	
+
 	/**
 	/**
 	 * 指定的营销员
 	 * 指定的营销员
 	 * @param orderNo
 	 * @param orderNo
@@ -250,9 +250,9 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateAppointSalesman(String orderNo,String salesmanId);
 	int updateAppointSalesman(String orderNo,String salesmanId);
-	
+
 	/**
 	/**
-	 * 
+	 *
 	 * @param orderNo
 	 * @param orderNo
 	 * @param depId
 	 * @param depId
 	 * @param buyerName
 	 * @param buyerName
@@ -263,10 +263,10 @@ public interface OrderService {
 	 * @param pageSize
 	 * @param pageSize
 	 * @return
 	 * @return
 	 */
 	 */
-	Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
+	Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
 			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String startDate,String endDate,Integer pageNo, Integer pageSize);
 			String startDate,String endDate,Integer pageNo, Integer pageSize);
-	
+
 	/**
 	/**
 	 * 我的订单流水(财务负责人课件)
 	 * 我的订单流水(财务负责人课件)
 	 * @param payeeName 收款人
 	 * @param payeeName 收款人
@@ -280,7 +280,7 @@ public interface OrderService {
 	 */
 	 */
 	Pagination<BillListBo> selectMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
 	Pagination<BillListBo> selectMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
-	
+
 
 
 	/**
 	/**
 	 * 我的订单流水查询(与订单相关的人员可见)
 	 * 我的订单流水查询(与订单相关的人员可见)
@@ -295,8 +295,8 @@ public interface OrderService {
 	 */
 	 */
 	Pagination<BillListBo> queryMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
 	Pagination<BillListBo> queryMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
-	
-	
+
+
 	/**
 	/**
 	 * 所有订单流水查询
 	 * 所有订单流水查询
 	 * @param payeeName
 	 * @param payeeName
@@ -310,7 +310,7 @@ public interface OrderService {
 	 */
 	 */
 	Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
 	Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
-	
+
 	/**
 	/**
 	 * 查看流水详情
 	 * 查看流水详情
 	 * @param billNo
 	 * @param billNo
@@ -326,8 +326,8 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
 	int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
-	
-	
+
+
 	/**
 	/**
 	 * 修改露水订单
 	 * 修改露水订单
 	 * @param billNo
 	 * @param billNo
@@ -365,14 +365,14 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateSetUpProject(String orderNo, String signComment);
 	int updateSetUpProject(String orderNo, String signComment);
-	
+
 	/**
 	/**
 	 * 订单编号
 	 * 订单编号
 	 * @param orderNo
 	 * @param orderNo
 	 * @return
 	 * @return
 	 */
 	 */
 	List<TOrderDetail> selectOrderCommodity(String orderNo);
 	List<TOrderDetail> selectOrderCommodity(String orderNo);
-	
+
 	/**
 	/**
 	 * 支付(测试用)
 	 * 支付(测试用)
 	 * @param orderNo
 	 * @param orderNo
@@ -417,7 +417,7 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateConfirmRefund(String orderNo,boolean confirm);
 	int updateConfirmRefund(String orderNo,boolean confirm);
-	
+
 	/**
 	/**
 	 * 转交订单
 	 * 转交订单
 	 * @param orderNo
 	 * @param orderNo
@@ -426,7 +426,7 @@ public interface OrderService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateTransferOrder(String orderNo,String aid,Integer targetType);
 	int updateTransferOrder(String orderNo,String aid,Integer targetType);
-	
+
 	/**
 	/**
 	 * PC端添加意向
 	 * PC端添加意向
 	 * @param orderNo 订单编号
 	 * @param orderNo 订单编号
@@ -438,15 +438,15 @@ public interface OrderService {
 	 * @param remarks 备注
 	 * @param remarks 备注
 	 * @return
 	 * @return
 	 */
 	 */
-	int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
+	int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
 			String createTime,String remarks) throws ParseException;
 			String createTime,String remarks) throws ParseException;
 
 
 	/**
 	/**
 	 * 添加变更记录
 	 * 添加变更记录
 	 * @param orderNo
 	 * @param orderNo
 	 * @param changeComment
 	 * @param changeComment
-	 * @param dunList 
-	 * @param taskList 
+	 * @param dunList
+	 * @param taskList
 	 * @return
 	 * @return
 	 */
 	 */
 	int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
 	int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
@@ -486,7 +486,7 @@ public interface OrderService {
 
 
 	int addBusinessProjectId(FollowBusinessBo fbb);
 	int addBusinessProjectId(FollowBusinessBo fbb);
 
 
-	
 
 
-	
+
+
 }
 }

+ 5 - 5
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -13,21 +13,21 @@ public class OutPublicDtails {
 	private String sname;
 	private String sname;
 	@Excel(name = "公出申请人")
 	@Excel(name = "公出申请人")
 	private String aname;
 	private String aname;
-	@Excel(name = "公出时长")
+	@Excel(name = "公出时长",width = 8)
 	private String duration;
 	private String duration;
-	@Excel(name = "状态" ,readConverterExp = "0=驳回,1=待审核,2=同意,3=撤销")
+	@Excel(name = "状态" ,readConverterExp = "0=驳回,1=待审核,2=同意,3=撤销",width = 8)
 	private Integer status;
 	private Integer status;
 	@Excel(name = "公出开始时间")
 	@Excel(name = "公出开始时间")
 	private String releaseStarts;
 	private String releaseStarts;
 	@Excel(name = "公出结束时间")
 	@Excel(name = "公出结束时间")
 	private String releaseEnds;
 	private String releaseEnds;
-	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡")
+	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡",width = 8)
 	private Integer clockIn;
 	private Integer clockIn;
 	@Excel(name = "打卡时间" )
 	@Excel(name = "打卡时间" )
 	private String clockInTimes;
 	private String clockInTimes;
 	@Excel(name = "创建时间" )
 	@Excel(name = "创建时间" )
 	private String createTimes;
 	private String createTimes;
-	@Excel(name = "公出类型",readConverterExp = "0=业务,1=技术,2=行政")
+	@Excel(name = "公出类型",readConverterExp = "0=业务,1=技术,2=行政",width = 8)
 	private Integer type;
 	private Integer type;
 	@Excel(name = "公出目标" )
 	@Excel(name = "公出目标" )
 	private String remarks;
 	private String remarks;
@@ -43,7 +43,7 @@ public class OutPublicDtails {
 	private String auditInfo;
 	private String auditInfo;
 	private String annexUrl;
 	private String annexUrl;
 	private String photoUrl;
 	private String photoUrl;
-	@Excel(name = "修改标识",readConverterExp = "0=否,1=是")
+	@Excel(name = "修改标识",readConverterExp = "0=否,1=是",width = 8)
 	private Integer updateStatus;
 	private Integer updateStatus;
 
 
 	public Integer getUpdateStatus() {
 	public Integer getUpdateStatus() {

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -369,10 +369,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
 		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
+		//type 0私有 1管理权限 2所有权限
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
 				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT )||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)){
 				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT )||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)){
 			in.setType(2);}
 			in.setType(2);}
-		else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)){
+		else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
 			in.setType(1);
 			in.setType(1);
 			map.put("deps", orderService.selectMyDeps());
 			map.put("deps", orderService.selectMyDeps());
 		} else{
 		} else{