权限进行修改

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/BusinessDeclareService.java

@@ -131,16 +131,20 @@ public class BusinessDeclareService {
 		List<String> roleList = userDetail.getRole_name();
 		List<BusinessDeclare> informationList=null;
 		int count=0;
-		//经办支行和二级支行可以查看所有的信息
+		/*//经办支行和二级支行可以查看所有的信息
 		if(roleList.contains(Role.TRAN_BRANCH_BANK)||roleList.contains(Role.SEC_BRANCH_BANK)){
 			informationList=businessDeclareDao.queryBusinessDeclareInformation(map);
 			count=businessDeclareDao.findAllInfromations(map);
-		}
+		}*/
 		if(roleList.contains(Role.BUSINESS_DEP_OF_PBB)){
 			//省分行营业部能看到的信息只有二级分行审核通过以后的信息才会显示，未通过或者是发起状态的都不会显示
 			//而且分页的话查询所有信息的条数也是按照之前的条件进行查询的
 			informationList=businessDeclareDao.queryBusinessDeclareInformationByPBB(map);
 			count=businessDeclareDao.findAllInfromationsByPBB(map);
+		}else{
+			//其它角色的都能查看
+			informationList=businessDeclareDao.queryBusinessDeclareInformation(map);
+			count=businessDeclareDao.findAllInfromations(map);
 		}
 		pageDTO.setRows(informationList);
 		pageDTO.setTotal(count);
@@ -164,18 +168,21 @@ public class BusinessDeclareService {
 		List<String> roleList = userDetail.getRole_name();
 		Integer businessId = (Integer) map.get("businessId");
 		Integer statusId = businessDeclareDao.getStatusIdByBusinessId(businessId);
-		//经办支行和二级支行可以查看所有的信息
+		/*//经办支行和二级支行可以查看所有的信息
 		if(roleList.contains(Role.TRAN_BRANCH_BANK)||roleList.contains(Role.SEC_BRANCH_BANK)){
 			return businessDeclareDao.queryBusinessCheckInformation(map);
-		}
-		if(roleList.contains(Role.TRAN_BRANCH_BANK)||roleList.contains(Role.SEC_BRANCH_BANK)){
-			//如果是待二级分行审核或者是二级分行审核不通过则返回一个空值
+		}*/
+		if(roleList.contains(Role.BUSINESS_DEP_OF_PBB)){
+			//对省分行来说，如果是待二级分行审核或者是二级分行审核不通过则返回一个空值
 			if(statusId==1||statusId==2){
 				return null;
 			}
 			return businessDeclareDao.queryBusinessCheckInformation(map);
+		}else{
+			//所有人都能查看
+			return businessDeclareDao.queryBusinessCheckInformation(map);
 		}
-		throw new RuntimeException("无权操作");
+//		throw new RuntimeException("无权操作");
 	}
 
 	/**

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/ProjectFileService.java

@@ -38,7 +38,8 @@ public class ProjectFileService {
 	public PageDTO queryProjectFileInformation(Map<String, Object> map) {
 		PageDTO pageDto = new PageDTO(); // 创建分页对象
 		int userId = (Integer) map.get("userId");
-		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);		//查看用户非空和权限
+//		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);		//查看用户非空和权限
+		userAuthoricationService.checkUserAuthority(userId);//所有人都能看
 		List<ProjectFile> informationList = projectFileDao.queryProjectFileInformation(map);
 		int count = projectFileDao.findAllInformation(map);
 		pageDto.setRows(informationList);
@@ -60,7 +61,8 @@ public class ProjectFileService {
 	 */
 	public Map<String, Object> checkoutProjectFiles(Map<String, Object> map) {
 		int userId = (Integer) map.get("userId");
-		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//查看用户非空和权限
+//		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//查看用户非空和权限
+		userAuthoricationService.checkUserAuthority(userId);	//所有人都能下载
 		List<ProjectFile> informationList = projectFileDao.checkoutProjectFiles(map);	//将项目id和项目名称封装成map到dao层去获取数据
 		Map<String, Object> mapBackToController = new LinkedHashMap<String, Object>();
 		mapBackToController.put("projectId", map.get("projectId"));		//展示给前端的项目id号码

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/PromptLetterService.java

@@ -37,15 +37,22 @@ public class PromptLetterService {
 			pageDto.setTotal(count);
 			pageDto.setRows(list);
 			return pageDto;
+		}else{
+			//除了管理员之外所有人都能查看，以风险岗的视角去查看
+			List<PromptLetter> list = promptLetterDao.queryPromptLetterByVenture(map);
+			int count = promptLetterDao.findAllInformation(map);
+			pageDto.setTotal(count);
+			pageDto.setRows(list);
+			return pageDto;
 		}
-		if(userDetail.getRole_name().contains(Role.VENTURE_MANAGEMENT_POS)){
+		/*if(userDetail.getRole_name().contains(Role.VENTURE_MANAGEMENT_POS)){
 			List<PromptLetter> list = promptLetterDao.queryPromptLetterByVenture(map);
 			int count = promptLetterDao.findAllInformation(map);
 			pageDto.setTotal(count);
 			pageDto.setRows(list);
 			return pageDto;
 		}
-		throw new RuntimeException("无权限操作");
+		throw new RuntimeException("无权限操作");*/
 	}
 
 	/**

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/BusinessDeclareAction.java

@@ -211,8 +211,9 @@ public class BusinessDeclareAction {
 			Map<String, Object> map = JSON.parseObject(data, Map.class);		//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
 			//首先校验用户权限问题
 			int userId=ValidationUtil.checkAndAssignInt(map.get("userId"));
-			//查看用户非空和权限(只有【经办支行,二级支行和省分行】有这个权限操作)
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);
+			//查看用户非空和权限(只有【经办支行,二级支行和省分行】有这个权限操作)====>>改成查看为让所有人放开权限
+//			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);
 			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); 									// 默认页是第一页
 			String businessName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("businessName"));	//业务名默认为空
 			long startTime = ValidationUtil.checkAndAssignDefaultLong(map.get("startTime"), 0L); 					//开始时间默认0
@@ -264,7 +265,8 @@ public class BusinessDeclareAction {
 			//首先校验用户权限问题
 			int userId=ValidationUtil.checkAndAssignInt(map.get("userId"));
 			//查看用户非空和权限(只有【经办支行,二级支行和省分行】有这个权限操作)
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);
+//			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//所有人都能查看
 			Integer businessId=ValidationUtil.checkAndAssignInt(map.get("businessId"));		//被审核的业务id号需要先被进行校验
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("userDetail", userDetail);
@@ -419,7 +421,8 @@ public class BusinessDeclareAction {
 										@RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);	//查看用户非空和权限(经办支行，二级分行，省分行都有这个权限操作)
+//			userAuthoricationService.checkUserAuthority(userId,Role.TRAN_BRANCH_BANK,Role.SEC_BRANCH_BANK,Role.BUSINESS_DEP_OF_PBB);	//查看用户非空和权限(经办支行，二级分行，省分行都有这个权限操作)
+			userAuthoricationService.checkUserAuthority(userId);//暂时放开所有权限
 			url=ValidationUtil.checkBlankAndAssignString(url);							//对传过来的url进行非空校验
 			String fileName = request.getServletContext().getRealPath("")+url; 		//SP是系统分隔符
 			//如果文件不存在直接抛出异常
@@ -463,7 +466,8 @@ public class BusinessDeclareAction {
 			@RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_DEP_OF_PBB);	//查看用户非空和权限(在业务申报的模块中只有省分行才有权限下载这个合同)
+//			userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_DEP_OF_PBB);	//查看用户非空和权限(在业务申报的模块中只有省分行才有权限下载这个合同)
+			userAuthoricationService.checkUserAuthority(userId);//暂时放开所有权限
 			url=ValidationUtil.checkBlankAndAssignString(url);							//对传过来的url进行非空校验
 			String fileName = request.getServletContext().getRealPath("")+url; 		//SP是系统分隔符
 			//如果文件不存在直接抛出异常

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/ProjectFileAction.java

@@ -155,7 +155,8 @@ public class ProjectFileAction {
 	public Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url,@RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
+//			userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
+			userAuthoricationService.checkUserAuthority(userId);//所有人都能下载
 			String fileName = request.getServletContext().getRealPath("")+url;  		//SP是系统分隔符
 			//如果文件不存在直接抛出异常
 			if(!new File(fileName).exists()){

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/PromptLetterAction.java

@@ -140,7 +140,8 @@ public class PromptLetterAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.ADMIN, Role.VENTURE_MANAGEMENT_POS);//获取操作用户详细信息和权限判断
+//			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.ADMIN, Role.VENTURE_MANAGEMENT_POS);//获取操作用户详细信息和权限判断
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//所有人都能查看
 			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1);
 			long startTime = ValidationUtil.checkAndAssignDefaultLong(map.get("startTime"), 0L);
 			long endTime = ValidationUtil.checkAndAssignDefaultLong(map.get("endTime"), Long.MAX_VALUE);
@@ -177,7 +178,8 @@ public class PromptLetterAction {
 											@RequestParam("userId") Object uId) throws Exception {
 		try {
 			int userId = ValidationUtil.checkAndAssignInt(uId);
-			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN, Role.VENTURE_MANAGEMENT_POS);//权限判断
+//			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN, Role.VENTURE_MANAGEMENT_POS);//权限判断
+			userAuthoricationService.checkUserAuthority(userId);//所有人都能下载
 			// 模拟文件，456.doc为需要下载的文件
 			String fileName = request.getSession().getServletContext().getRealPath("") + url;
 			// 获取输入流

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/TrueFalseSelectAction.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.TrueFalseSelectService;
 import com.fuzamei.service.UserAuthoricationService;
@@ -58,7 +59,7 @@ public class TrueFalseSelectAction {
 		   		throw new RuntimeException("上传文件不能为空");
 		   	}
 		   	int userId = ValidationUtil.checkAndAssignInt(uId);//对用户id进行校验
-		   	UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//获取用户详细信息
+		   	UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.INNERS_OF_BANK);//获取用户详细信息
 		   	
 		   	String path = request.getServletContext().getRealPath("")+SP+"content"; //==>>待定TODO
 	       	

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/ValuationAccountingAction.java

@@ -83,7 +83,8 @@ public class ValuationAccountingAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));										//userId只要是一个int类型即可
-			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);				//查看用户非空和权限
+//			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);				//查看用户非空和权限
+			userAuthoricationService.checkUserAuthority(userId);				//所有人都能查看
 			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); 									// 默认页是第一页
 			String fundName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("fundName"));			//基金名默认为空
 			String battleResult=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("battleResult"));	//比对结果默认为空
@@ -133,7 +134,8 @@ public class ValuationAccountingAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));										//userId只要是一个int类型即可
-			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);				//查看用户非空和权限
+//			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);				//查看用户非空和权限
+			userAuthoricationService.checkUserAuthority(userId);				//所有人都能下载
 			int fundId = ValidationUtil.checkAndAssignInt(map.get("fundId"));										//fundId只要是一个int类型即可
 			List<ValuationAccount> listToClient = valuationAccountingService.checkoutDownloadInformation(fundId);	//这个map是去service层调取数据的
 			return JSONUtil.getJsonMap(200, true, HintMSG.CHECK_SUCCESS, listToClient);
@@ -195,7 +197,8 @@ public class ValuationAccountingAction {
 										@RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);	//查看用户非空和权限(管理员和核算岗都能进行下载)
+//			userAuthoricationService.checkUserAuthority(userId,Role.ADMIN,Role.ACCOUNTING_POS_OF_TBC);	//查看用户非空和权限(管理员和核算岗都能进行下载)
+			userAuthoricationService.checkUserAuthority(userId);	//所有人都能下载
 			url=ValidationUtil.checkBlankAndAssignString(url);							//对传过来的url进行非空校验
 			String fileName = request.getServletContext().getRealPath("")+url;  		//SP是系统分隔符
 			//如果文件不存在直接抛出异常