Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java

@@ -60,5 +60,10 @@ public class Notice extends TenantEntity {
 	@ApiModelProperty(value = "内容")
 	private String content;
 
+	/**
+	 * 发送范围
+	 */
+	@ApiModelProperty(value = "发送范围")
+	private String sendRange;
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.constant.LandConstant;
 import org.springblade.client.corps.excel.*;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.corps.service.ICorpsTypeDescService;
@@ -321,6 +322,15 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.like(StringUtil.isNotBlank(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(corpsDesc.getCorpType()), CorpsDesc::getCorpType, corpsDesc.getCorpType());
+
+		String role = AuthUtil.getUserRole();
+		if (!role.contains("admin")){//admin能看全部，不是admin根据分管员查询
+			if (Func.isNotEmpty(corpsDesc.getAdminProfiles())) {
+				lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles, ' ')
+					.or().isNull(CorpsDesc::getAdminProfiles));
+			}
+		}
 
 		//获得客户信息
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
@@ -457,6 +467,15 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.in(CorpsDesc::getInitials, corpsDesc.getInitials());
+		lambdaQueryWrapper.like(CorpsDesc::getCorpType, corpsDesc.getCorpType());
+
+		String role = AuthUtil.getUserRole();
+		if (!role.contains("admin")){//admin能看全部，不是admin根据分管员查询
+			if (Func.isNotEmpty(corpsDesc.getAdminProfiles())) {
+				lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles, ' ')
+					.or().isNull(CorpsDesc::getAdminProfiles));
+			}
+		}
 
 		//获得客户信息
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
@@ -511,9 +530,12 @@ public class CorpsDescController extends BladeController {
 		} else {
 			lambdaQueryWrapper.like(CorpsDesc::getCorpType, corpsDesc.getCorpType());
 		}
-		if (Func.isNotEmpty(corpsDesc.getAdminProfiles())) {
-			lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles, ' ')
-				.or().isNull(CorpsDesc::getAdminProfiles));
+		String role = AuthUtil.getUserRole();
+		if (!role.contains("admin")){//admin能看全部，不是admin根据分管员查询
+			if (Func.isNotEmpty(corpsDesc.getAdminProfiles())) {
+				lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles()).or().eq(CorpsDesc::getAdminProfiles, ' ')
+					.or().isNull(CorpsDesc::getAdminProfiles));
+			}
 		}
 		if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
 			lambdaQueryWrapper.and(i -> i.eq(CorpsDesc::getBelongtocompany, corpsDesc.getBelongtocompany()).or().isNull(CorpsDesc::getBelongtocompany));

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -1025,9 +1025,6 @@ public class ProjectController {
 				itemLambdaQueryWrapper.eq(ObjectUtils.isNotNull(userList), ServiceProjectItem::getUserid, userList.get(0).getId());
 			}
 		}
-		if (taskStatus.equals("undefined")){
-			taskStatus = null;
-		}
 		itemLambdaQueryWrapper.orderByDesc(ServiceProjectItem::getUserid)
 			.eq(ServiceProjectItem::getIsDeleted, 0)
 			.eq(StringUtils.isNotBlank(taskStatus), ServiceProjectItem::getStatus, taskStatus)

blade-service/trade-purchase/src/main/java/com/trade/purchase/dealer/PurchaseContract.java

@@ -171,9 +171,6 @@ public class PurchaseContract extends BladeController {
 			{
 				return R.data(Collections.EMPTY_LIST,"暂无相关数据");
 			}
-
-
-
 		}
 		//采购商
 		if(StringUtils.isNotBlank(strPurchaserName))
@@ -285,8 +282,6 @@ public class PurchaseContract extends BladeController {
 						.reduce(BigDecimal.ZERO, BigDecimal::add);
 					e.setAmount(actualWeight);
 				}
-
-
 			});
 		}
 		return R.data(pages);