客户商品修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -242,6 +242,16 @@ public class GoodsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否按批次号计算 默认 0 否 1是")
 	private int batch;
+	/**
+	 * 所属公司
+	 */
+	@ApiModelProperty(value = "所属公司")
+	private String artsVision;
+	/**
+	 * 所属公司中文名
+	 */
+	@ApiModelProperty(value = "所属公司中文名")
+	private String artsVisionName;
 
 
 

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

@@ -285,6 +285,11 @@ public class CorpsDescController extends BladeController {
 			throw new SecurityException("缺少必要的参数，客户类型");
 		}
 		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if (Func.isNotEmpty(corpsDesc.getAdminProfiles())){
+			lambdaQueryWrapper.like(CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles());
+			lambdaQueryWrapper.or();
+			lambdaQueryWrapper.eq(CorpsDesc::getAdminProfiles,' ');
+		}
 		if ("KG".equals(corpsDesc.getCorpType())) {
 			lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getCorpType, "KH").or().like(CorpsDesc::getCorpType, "GYS"));
 		} else {
@@ -292,7 +297,6 @@ public class CorpsDescController extends BladeController {
 		}
 		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
 		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()), CorpsDesc::getCode, corpsDesc.getCode());
-		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getAdminProfiles()), CorpsDesc::getAdminProfiles, corpsDesc.getAdminProfiles());
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);
@@ -301,7 +305,9 @@ public class CorpsDescController extends BladeController {
 		voList.forEach(desc -> {
 			if (StringUtils.isNotBlank(desc.getBelongtocompany())) {
 				CorpsDesc company = corpsDescService.getById(desc.getBelongtocompany());
-				desc.setBelongCompany(company.getCname());
+				if (company != null){
+					desc.setBelongCompany(company.getCname());
+				}
 			}
 		});
 		return R.data(voList);

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -57,10 +57,13 @@
         from
         basic_corps_desc
         where
-        is_deleted = 0
+        1 = 1
         <if test="CorpsDesc.id!=null">
             and id = #{CorpsDesc.id}
         </if>
+        <if test="CorpsDesc.isDeleted!=null">
+            and is_deleted = #{CorpsDesc.isDeleted}
+        </if>
         <if test="CorpsDesc.code!=null and CorpsDesc.code != ''">
             and code like CONCAT(CONCAT('%', #{CorpsDesc.code}), '%')
         </if>
@@ -140,8 +143,8 @@
             and credit_level like CONCAT(CONCAT('%',  #{CorpsDesc.creditLevel}), '%')
         </if>
         <if test="CorpsDesc.adminProfiles!=null and CorpsDesc.adminProfiles != ''">
-            and admin_profiles like CONCAT(CONCAT('%',  #{CorpsDesc.adminProfiles}), '%')
-            AND admin_profiles = ''
+            and (admin_profiles like CONCAT(CONCAT('%',  #{CorpsDesc.adminProfiles}), '%')
+            or admin_profiles = '')
         </if>
         <if test="CorpsDesc.creditGrant!=null">
             and credit_grant = #{CorpsDesc.creditGrant}

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -475,7 +475,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				//如果名称相等 就认为重复
 				LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
 				queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());
-				queryWrapper.eq(GoodsDesc::getCname,goodsDesc.getCname());
+				queryWrapper.eq(GoodsDesc::getCode,goodsDesc.getCode());
 				queryWrapper.eq(GoodsDesc::getIsDeleted,0);
 				GoodsDesc one = goodsDescMapper.selectOne(queryWrapper);