Browse Source

fix: 修改积分包-重名校验问题

lixuesong 1 year ago
parent
commit
4c1a33d382

+ 7 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2874,6 +2874,10 @@ public class WmScorePackageController {
 
 		log.info("修改积分包(小包)入参:{}", wmScorePackage);
 
+		if (wmScorePackage.getId() != null) {
+			return R.failed("积分包id必填");
+		}
+
 		//定额
 		if (wmScorePackage.getPackageType1().equals("1") && wmScorePackage.getScore() <= 0) {
 			return R.failed("积分包分值必须大于0");
@@ -2891,9 +2895,10 @@ public class WmScorePackageController {
 			long existed = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
 					.eq(WmScorePackage::getDelFlag, "0")
 					.eq(WmScorePackage::getDeptId, wmScorePackage.getDeptId())
-					.eq(WmScorePackage::getScorePackageName, wmScorePackage.getScorePackageName()));
+					.eq(WmScorePackage::getScorePackageName, wmScorePackage.getScorePackageName())
+					.ne(WmScorePackage::getId, wmScorePackage.getId()));
 			if (existed != 0) {
-				return R.failed("积分包名称或积分包序列号已存在");
+				return R.failed("积分包名称已存在");
 			}
 
 		}