Browse Source

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

anderx 3 years ago
parent
commit
97e25d1a31

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

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

+ 11 - 4
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

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

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

@@ -150,4 +150,5 @@ public interface OrganizationManagementMapper {
 			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
+	void selectByAidGetDep(String aid);
 }

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

@@ -660,5 +660,6 @@
 	and d.id= #{depId}
 	</if>
 	</select>
+    <select id="selectByAidGetDep"></select>
 
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/core/shiro/session/CustomSessionManager.java

@@ -37,7 +37,7 @@ public class CustomSessionManager extends DefaultWebSessionManager {
 		System.out.println("请求 token=============="+sid);
 		if (StringUtils.isNotBlank(sid)) {
 			// 是否将sid保存到cookie,浏览器模式下使用此参数。
-			if (WebUtils.isTrue(request, "AFT_SID")) {
+			if (WebUtils.isTrue(request, "KEDE_SID")) {
 				Cookie template = getSessionIdCookie();
 				Cookie cookie = new SimpleCookie(template);
 				cookie.setValue(sid);

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

@@ -330,7 +330,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public List<OutPublicStatistics> publicReleaseStatisticsList(InputPublicStatistics in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		if(in.getAid()!=null)map.put("aid", in.getAid());
-		if(in.getDepId()!=null)map.put("depId", in.getDepId());
+		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
+				TokenManager.hasRole(AFTConstants.CED)|| TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
+			if(in.getDepId()!=null)map.put("depId", in.getDepId());
+		}else if (TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)){
+
+
+		}
+
 		if(in.getClockStart()!=null)map.put("clockStart", in.getClockStart());
 		if(in.getClockEnd()!=null)map.put("clockEnd", in.getClockEnd()+" 23:59:59");
 		if(in.getCreateStart()!=null)map.put("createStart", in.getCreateStart());

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -74,7 +74,7 @@
 
 	<bean id="sessionIdCookie"
 		class="org.apache.shiro.web.servlet.SimpleCookie">
-		<constructor-arg value="AFT_SID" />
+		<constructor-arg value="KEDE_SID" />
 		<property name="httpOnly" value="true" />
 		<property name="maxAge" value="2592000" />
 		<!-- <property name="domain" value=""/> -->