fix: npe

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -441,11 +441,11 @@ public class ApiController {
 		WmTaskContentConfig queryConn = new WmTaskContentConfig();
 		// 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 统一设置为 39（应收账款回款-A类）
 		if ("39".equals(taskTypeId) || "40".equals(taskTypeId) || "41".equals(taskTypeId)) {
-			taskTypeId  = "39";
+			taskTypeId = "39";
 		}
 		if ("42".equals(taskTypeId) || "43".equals(taskTypeId) || "44".equals(taskTypeId)) {
 			// 手术跟台-一级/手术跟台-二级/手术跟台-三级 都取42
-			taskTypeId  = "42";
+			taskTypeId = "42";
 		}
 
 		queryConn.setTaskTypeId(taskTypeId);
@@ -607,7 +607,7 @@ public class ApiController {
 	/**
 	 * 用户信息-获取用户基本信息
 	 *
-	 * @param code 小程序信息code
+	 * @param code   小程序信息code
 	 * @param avatar 头像
 	 * @return 用户信息
 	 */
@@ -664,9 +664,9 @@ public class ApiController {
 			List<String> ids = packageStatuses.stream().map(WmScorePackageStatus::getPackageId).collect(Collectors.toList());
 
 
-			int paid = 0 ;
+			int paid = 0;
 			int unpaid = 0;
-			if (CollUtil.isNotEmpty(ids)){
+			if (CollUtil.isNotEmpty(ids)) {
 				List<WmScorePackage> packages = wmScorePackageService.listByIds(ids);
 
 				Map<String, Integer> collect = packages.stream().filter(pkg -> "4".equals(pkg.getScorePackageStatus()) || "6".equals(pkg.getScorePackageStatus()))
@@ -674,8 +674,10 @@ public class ApiController {
 						.entrySet().stream()
 						.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream().mapToInt(WmScorePackage::getScore).sum()));
 
-				paid = collect.get("6");
-				unpaid = collect.get("4");
+				if (CollUtil.isNotEmpty(collect)) {
+					paid = collect.get("6") != null ? collect.get("6") : 0;
+					unpaid = collect.get("4") != null ? collect.get("4") : 0;
+				}
 
 			}
 			mapOne.put("paid", paid);
@@ -700,7 +702,7 @@ public class ApiController {
 			// 获取部门信息
 			SysDept sysDept = sysDeptService.getById(sysU.getDeptId());
 			mapOne.put("deptId", sysDept.getDeptId().toString());
-			mapOne.put("deptName", sysDept.getName() );
+			mapOne.put("deptName", sysDept.getName());
 
 			// 获取csm信息
 			SysDeptCsm deptCsm = deptCsmService.getOne(Wrappers.<SysDeptCsm>lambdaQuery().eq(SysDeptCsm::getDeptId, sysU.getDeptId()));
@@ -723,9 +725,9 @@ public class ApiController {
 							.filter(item -> item.getRoleId() == 5 || item.getRoleId() == 6 || item.getRoleId() == 10 || item.getRoleId() == 13)
 							.map(SysRole::getRoleId).collect(Collectors.toList());
 
-			boolean managementFlag =("2".equals(management) && roleIdList.contains(5))
-					|| ("3".equals(management) && (roleIdList.contains(6) ||roleIdList.contains(10)))
-					||("4".equals(management));
+			boolean managementFlag = ("2".equals(management) && roleIdList.contains(5))
+					|| ("3".equals(management) && (roleIdList.contains(6) || roleIdList.contains(10)))
+					|| ("4".equals(management));
 			mapOne.put("managementFlag", managementFlag);
 
 			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.getById(sysU.getDrugEntId());
@@ -754,7 +756,7 @@ public class ApiController {
 
 			Set<String> pkgIds = statusList.stream().filter(item -> "2".equals(item.getStatus())).map(WmScorePackageStatus::getPackageId).collect(Collectors.toSet());
 			List<Map<String, Object>> listMap;
-			if (CollUtil.isNotEmpty(pkgIds)){
+			if (CollUtil.isNotEmpty(pkgIds)) {
 				List<WmScorePackage> pkgs = wmScorePackageService.listByIds(pkgIds);
 				listMap = pkgs.stream().map(pkg -> {
 					Map<String, Object> map = new HashMap<>(2);
@@ -1100,7 +1102,7 @@ public class ApiController {
 		R<?> r = null;
 		try {
 			r = wmTaskContentService.saveTaskContent(wmTaskContent);
-		} catch (Exception e){
+		} catch (Exception e) {
 			log.error("", e);
 			return R.failed(e.getMessage());
 		} finally {
@@ -1589,7 +1591,7 @@ public class ApiController {
 
 		// 重置打卡时间，以系统为准，规避端设备时间不准的问题
 		LocalDateTime now = LocalDateTime.now().plusMinutes(5L);
-		if (wmUserSign.getSignDate().isAfter(now)){
+		if (wmUserSign.getSignDate().isAfter(now)) {
 			return R.failed("打卡时间异常，请检查设备日期");
 		}
 
@@ -3581,7 +3583,6 @@ public class ApiController {
 		}
 
 
-
 		// 获取分享人
 		SysUser sysUser = sysUserService.getById(shareUserId);
 
@@ -3599,7 +3600,7 @@ public class ApiController {
 					if ("album".equalsIgnoreCase(taskCategoryName)) {
 						info = checkAlbumLimit(wmWkAlbum, sysUser, "8", tWmScorePackage.getRelatedService());
 					} else if ("article".equalsIgnoreCase(taskCategoryName)) {
-						info = checkArticleLimit(wmWkArticle, sysUser,"9", tWmScorePackage.getRelatedService());
+						info = checkArticleLimit(wmWkArticle, sysUser, "9", tWmScorePackage.getRelatedService());
 					}
 					if (StringUtils.isNotEmpty(info)) {
 						return R.failed(info);
@@ -3942,20 +3943,20 @@ public class ApiController {
 	/**
 	 * 文章打开判断
 	 *
-	 * @param article 文章
-	 * @param user    分享用户
-	 * @param task    任务
+	 * @param article    文章
+	 * @param user       分享用户
+	 * @param task       任务
 	 * @param taskTypeId 任务类型id
-	 * @param pkgId 积分包id
+	 * @param pkgId      积分包id
 	 * @return 校验信息
 	 */
-	private Boolean checkArticleOpenLimit(WmWkArticle article, SysUser user, WmTask task,  String taskTypeId, String pkgId) {
+	private Boolean checkArticleOpenLimit(WmWkArticle article, SysUser user, WmTask task, String taskTypeId, String pkgId) {
 		Assert.notNull(article);
 
 		List<WmTaskSubmissionRule.SubmissionRule> rules = wmTaskContentService.getTaskSubmissionRule(taskTypeId, pkgId);
 
 		int maxShareTimes = upmsConfig.getMaxShareTimes();
-		if (CollUtil.isNotEmpty(rules)){
+		if (CollUtil.isNotEmpty(rules)) {
 			// 获取限制
 			for (int i = 0, size = rules.size(); i < size; i++) {
 				Map<String, Object> map = (Map<String, Object>) rules.get(i);
@@ -3989,20 +3990,20 @@ public class ApiController {
 	/**
 	 * 相册打开判断
 	 *
-	 * @param album 相册
-	 * @param user  分享用户
-	 * @param task  任务
+	 * @param album      相册
+	 * @param user       分享用户
+	 * @param task       任务
 	 * @param taskTypeId 任务类型id
-	 * @param pkgId 积分包id
+	 * @param pkgId      积分包id
 	 * @return 校验信息
 	 */
-	private Boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task,  String taskTypeId, String pkgId) {
+	private Boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task, String taskTypeId, String pkgId) {
 		Assert.notNull(album);
 
 		List<WmTaskSubmissionRule.SubmissionRule> rules = wmTaskContentService.getTaskSubmissionRule(taskTypeId, pkgId);
 
 		int maxShareTimes = upmsConfig.getMaxShareTimes();
-		if (CollUtil.isNotEmpty(rules)){
+		if (CollUtil.isNotEmpty(rules)) {
 			// 获取限制
 			for (int i = 0, size = rules.size(); i < size; i++) {
 				Map<String, Object> map = (Map<String, Object>) rules.get(i);
@@ -4050,8 +4051,8 @@ public class ApiController {
 	 *
 	 * @param wmWkArticle 文章
 	 * @param sysUser     转发人
-	 * @param taskTypeId 任务类型id
-	 * @param pkgId 积分包id
+	 * @param taskTypeId  任务类型id
+	 * @param pkgId       积分包id
 	 * @return 校验信息
 	 */
 	private String checkArticleLimit(WmWkArticle wmWkArticle, SysUser sysUser, String taskTypeId, String pkgId) {
@@ -4060,7 +4061,7 @@ public class ApiController {
 		List<WmTaskSubmissionRule.SubmissionRule> rules = wmTaskContentService.getTaskSubmissionRule(taskTypeId, pkgId);
 
 		int maxShareTimes = upmsConfig.getMaxShareTimes();
-		if (CollUtil.isNotEmpty(rules)){
+		if (CollUtil.isNotEmpty(rules)) {
 			// 获取限制
 			for (int i = 0, size = rules.size(); i < size; i++) {
 				Map<String, Object> map = (Map<String, Object>) rules.get(i);
@@ -4101,10 +4102,10 @@ public class ApiController {
 	/**
 	 * 校验相册转发限制
 	 *
-	 * @param wmWkAlbum 相册
-	 * @param sysUser   分享人
+	 * @param wmWkAlbum  相册
+	 * @param sysUser    分享人
 	 * @param taskTypeId 任务类型id
-	 * @param pkgId 积分包id
+	 * @param pkgId      积分包id
 	 * @return 校验结果信息
 	 */
 	private String checkAlbumLimit(WmWkAlbum wmWkAlbum, SysUser sysUser, String taskTypeId, String pkgId) {
@@ -4114,7 +4115,7 @@ public class ApiController {
 		List<WmTaskSubmissionRule.SubmissionRule> rules = wmTaskContentService.getTaskSubmissionRule(taskTypeId, pkgId);
 
 		int maxShareTimes = upmsConfig.getMaxShareTimes();
-		if (CollUtil.isNotEmpty(rules)){
+		if (CollUtil.isNotEmpty(rules)) {
 			// 获取限制
 			for (int i = 0, size = rules.size(); i < size; i++) {
 				Map<String, Object> map = (Map<String, Object>) rules.get(i);
@@ -4239,13 +4240,13 @@ public class ApiController {
 	@GetMapping(value = "/eid")
 	public R<?> getEidToken(@RequestParam(value = "idCard") String idCard,
 							@RequestParam(value = "realName") String realName,
-							@RequestParam(value = "endType", required = false) String endType){
+							@RequestParam(value = "endType", required = false) String endType) {
 
 		endType = upmsConfig.getEndType();
 
 		String tokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/eid?idCard={idCard}&realName={realName}&endType={endType}";
 
-		ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(tokenUrl, String.class, idCard,realName, endType);
+		ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(tokenUrl, String.class, idCard, realName, endType);
 
 		log.info("获取e-token：{}", tokenResult.getBody());
 
@@ -4265,7 +4266,7 @@ public class ApiController {
 	 */
 	@GetMapping(value = "/eid/result")
 	public R<?> getEidResult(@RequestParam(value = "token") String token,
-							 @RequestParam(value = "endType", required = false) String endType){
+							 @RequestParam(value = "endType", required = false) String endType) {
 
 		endType = upmsConfig.getEndType();
 
@@ -4328,7 +4329,7 @@ public class ApiController {
 		// 获取用户信息判断，是否需要发送验证码
 		SysUser sysUser = sysUserService.getById(userId);
 
-		if (Objects.isNull(sysUser)){
+		if (Objects.isNull(sysUser)) {
 			log.error("用户不存在");
 			return R.failed("用户不存在");
 		}
@@ -4341,7 +4342,7 @@ public class ApiController {
 
 		Boolean res = redisTemplate.hasKey(key) ? code.equals(redisTemplate.opsForValue().get(key)) : Boolean.FALSE;
 
-		if (res){
+		if (res) {
 			redisTemplate.delete(key);
 		}