huanglizhi 1 éve
szülő
commit
cb55c2eecc

+ 2 - 1
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductDTO.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.hys.app.model.erp.dos.ProductDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
@@ -34,7 +35,7 @@ public class ProductDTO {
     private String barCode;
 
     @ApiModelProperty(name = "sku", value = "sku")
-    @Min(value = 4,message = "sku最小长度4")
+    @Length(min = 4,message = "sku最小长度4")
     private String sku;
 
     @ApiModelProperty(name = "price", value = "售价")

+ 10 - 10
module-erp/src/main/java/com/hys/app/service/system/impl/AdminUserManagerImpl.java

@@ -157,16 +157,16 @@ public class AdminUserManagerImpl implements AdminUserManager {
             throw new ResourceNotFoundException("当前管理员不存在");
         }
         //如果修改的是从超级管理员到普通管理员 需要校验此管理员是否是最后一个超级管理员
-        if (adminUser.getFounder().equals(1) && !adminUserVO.getFounder().equals(1)) {
-
-            QueryWrapper<AdminUser> wrapper = new QueryWrapper<>();
-            wrapper.eq("founder", 1).eq("user_state", 0);
-            List<AdminUser> adminUsers = adminUserMapper.selectList(wrapper);
-
-            if (adminUsers.size() <= 1) {
-                throw new ServiceException(SystemErrorCode.E916.code(), "必须保留一个超级管理员");
-            }
-        }
+//        if (adminUser.getFounder().equals(1) && !adminUserVO.getFounder().equals(1)) {
+//
+//            QueryWrapper<AdminUser> wrapper = new QueryWrapper<>();
+//            wrapper.eq("founder", 1).eq("user_state", 0);
+//            List<AdminUser> adminUsers = adminUserMapper.selectList(wrapper);
+//
+//            if (adminUsers.size() <= 1) {
+//                throw new ServiceException(SystemErrorCode.E916.code(), "必须保留一个超级管理员");
+//            }
+//        }
         if (!adminUserVO.getFounder().equals(1)) {
             RoleDO roleDO = roleManager.getModel(adminUserVO.getRoleId());
             if (roleDO == null) {