diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java
index bd1d64da..cedc783e 100644
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java
@@ -88,7 +88,7 @@ public class EquSupplierController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('device:supplier:add')")
@Log(title = "供应商功能信息", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@ApiOperation("新增供应商功能信息")
public AjaxResult add(@RequestBody EquSupplierAddDto dto)
{
@@ -102,7 +102,7 @@ public class EquSupplierController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('device:supplier:edit')")
@Log(title = "供应商功能信息", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PutMapping("/edit")
@ApiOperation("修改供应商功能信息列表")
public AjaxResult edit(@RequestBody EquSupplierUpdateDto updateDto) {
return toAjax(equSupplierService.updateEquSupplier(updateDto));
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java
index 9761a0d5..318581ca 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java
@@ -50,7 +50,7 @@ public class EquManu
private Long status;
//@JsonIgnore
- private Long createBy; // 新增
+ private String createBy; // 新增
public EquManu() {}
@@ -144,11 +144,11 @@ public class EquManu
return status;
}
- public Long getCreateBy() {
+ public String getCreateBy() {
return createBy;
}
- public void setCreateBy(Long createBy) {
+ public void setCreateBy(String createBy) {
this.createBy = createBy;
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java
index d627d1a5..b67e0985 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java
@@ -41,8 +41,8 @@ public class EquSupplier
@Excel(name = "l联系方式")
private String contactWay;
/** 联系人姓名 */
- @Excel(name = "创建人id")
- private long createBy;
+ @Excel(name = "创建人")
+ private String createBy;
@@ -117,12 +117,12 @@ public class EquSupplier
return status;
}
- public Long getCreateBy()
+ public String getCreateBy()
{
return createBy;
}
- public void setCreateBy(Long createBy)
+ public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java
index 054932fa..110d5090 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java
@@ -43,7 +43,7 @@ public class EquType
private Date createDate;
//@JsonIgnore
- private Long createBy;
+ private String createBy;
public EquType() {}
@@ -106,11 +106,11 @@ public class EquType
return createDate;
}
- public Long getCreateBy() {
+ public String getCreateBy() {
return createBy;
}
- public void setCreateBy(Long createBy) {
+ public void setCreateBy(String createBy) {
this.createBy = createBy;
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java
index 0c2f1b26..01f63a2d 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java
@@ -59,8 +59,8 @@ public class EquManuServiceImpl implements IEquManuService
{
equManu.setId(UUID.randomUUID().toString());
equManu.setCreateDate(new Date());
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equManu.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equManu.setCreateBy(userName);
return equManuMapper.insertEquManu(equManu);
}
@@ -73,8 +73,8 @@ public class EquManuServiceImpl implements IEquManuService
@Override
public int updateEquManu(EquManu equManu)
{
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equManu.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equManu.setCreateBy(userName);
return equManuMapper.updateEquManu(equManu);
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java
index e583f9f2..7f5ec8a7 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java
@@ -75,8 +75,8 @@ public class EquSupplierServiceImpl implements IEquSupplierService
equSupplier.setCreateTime(new Date()); // 自动生成创建时间
equSupplier.setStatus(dto.getStatus());
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equSupplier.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equSupplier.setCreateBy(userName);
return equSupplierMapper.insertEquSupplier(equSupplier);
}
@@ -101,8 +101,8 @@ public class EquSupplierServiceImpl implements IEquSupplierService
// 后端自动设置修改时间
equSupplier.setCreateTime(new Date());
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equSupplier.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equSupplier.setCreateBy(userName);
return equSupplierMapper.updateEquSupplier(equSupplier);
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java
index 08303f4f..047158a1 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java
@@ -56,8 +56,8 @@ public class EquTypeServiceImpl implements IEquTypeService
public int insertEquType(EquType equType)
{
equType.setId(UUID.randomUUID().toString());
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equType.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equType.setCreateBy(userName);
return equTypeMapper.insertEquType(equType);
}
@@ -70,8 +70,8 @@ public class EquTypeServiceImpl implements IEquTypeService
@Override
public int updateEquType(EquType equType)
{
- Long userId = SecurityUtils.getLoginUser().getUserId();
- equType.setCreateBy(userId);
+ String userName = SecurityUtils.getLoginUser().getUser().getUserName();
+ equType.setCreateBy(userName);
return equTypeMapper.updateEquType(equType);
}
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml
index 74c9bf3a..7906ad34 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml
@@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and name like concat('%', #{name}, '%')
and description = #{description}
- and contact_by = #{contactBy}
+ and contact_by LIKE CONCAT('%', #{contactBy}, '%')
and contact_way = #{contactWay}
and create_date = #{createDate}
and status = #{status}
- and create_by = #{createBy}
+ and create_by LIKE CONCAT('%', #{createBy}, '%')
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml
index 374df3f4..59f346b3 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml
@@ -30,9 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and name like concat('%', #{name}, '%')
and description = #{description}
- and contact_by = #{contactBy}
+ and contact_by LIKE CONCAT('%', #{contactBy}, '%')
and contact_way = #{contactWay}
and status = #{status}
+ and create_by LIKE CONCAT('%', #{createBy}, '%')
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquTypeMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquTypeMapper.xml
index a9f2ba48..0001b1e9 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquTypeMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquTypeMapper.xml
@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and description = #{description}
and image = #{image}
and create_date = #{createDate}
+ and create_by LIKE CONCAT('%', #{createBy}, '%')