新增修改方法

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsAdmin.java

@@ -38,6 +38,16 @@ public class UmsAdmin implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String compName;
 
+    private boolean isAdmin = false;
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public void setAdmin(boolean admin) {
+        isAdmin = admin;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsAdminParam.java

@@ -28,7 +28,6 @@ public class UmsAdminParam {
     @ApiModelProperty(value = "用户头像")
     private String icon;
     @ApiModelProperty(value = "邮箱")
-    @Email(message = "邮箱格式不合法")
     private String email;
     @ApiModelProperty(value = "用户昵称")
     @NotBlank(message = "姓名不能为空")

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -89,6 +89,7 @@ public class PmsProductServiceImpl implements PmsProductService {
             throw new RuntimeException("没有绑定供应商无法新增!");
         }
         productParam.setCompId(compId);
+        productParam.setCompName(CurrUserUtil.getCompName());
         productParam.setCreateId((long) CurrUserUtil.getUserId());
         productParam.setCreateTime(new Date());
         productMapper.insertSelective(product);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsAdminServiceImpl.java

@@ -15,6 +15,7 @@ import com.hwrj.cloud.admin.mapper.UmsAdminRoleRelationMapper;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.UmsAdminCacheService;
 import com.hwrj.cloud.admin.service.UmsAdminService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import com.hwrj.cloud.common.exception.GlobalException;
 import com.hwrj.cloud.security.util.JwtTokenUtil;
 import org.slf4j.Logger;
@@ -181,6 +182,10 @@ public class UmsAdminServiceImpl implements UmsAdminService {
             criteria.andUsernameLike("%" + keyword + "%");
             example.or(example.createCriteria().andNickNameLike("%" + keyword + "%"));
         }
+        //判断是不是admin 是admin 不移除自己 反之
+        if(!CurrUserUtil.getUmsAdmin().isAdmin()){
+            criteria.andUsernameNotEqualTo("admin");
+        }
         return adminMapper.selectByExample(example);
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/util/CurrUserUtil.java

@@ -33,6 +33,10 @@ public class CurrUserUtil {
         if (StringUtils.isEmpty(umsAdmin)) {
             throw new GlobalException((int) ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage());
         }
+        String username = umsAdmin.getUsername();
+        if("admin".equals(username)){
+            umsAdmin.setAdmin(true);
+        }
         return umsAdmin;
     }
 

forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -177,6 +177,7 @@
         <if test="search != null and search != ''">
             AND concat(a.`name`, a.brand_name) LIKE concat(concat('%', #{search}, '%'))
         </if>
+        order by a.create_time desc
     </select>
 
     <resultMap id="bigDatainfoMap" type="com.hwrj.cloud.admin.dto.param.BigDataListInfoVo">