接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/EmployeeVo.java

@@ -91,7 +91,6 @@ public class EmployeeVo {
     /**
      * 密码
      */
-    @ExcelProperty(value = "密码")
     @ApiModelProperty("密码")
     private String password;
 

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/ShopVo.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.clock.service.IAgentService;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import io.swagger.annotations.ApiModel;
@@ -23,7 +24,7 @@ import java.util.Date;
 @Data
 @ApiModel("门店信息视图对象")
 @ExcelIgnoreUnannotated
-public class ShopVo {
+public class ShopVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/EmployeeServiceImpl.java

@@ -74,7 +74,7 @@ public class EmployeeServiceImpl implements IEmployeeService {
         lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), Employee::getEmployeeName, bo.getEmployeeName());
         lqw.eq(bo.getAgentId() != null, Employee::getAgentId, bo.getAgentId());
         lqw.eq(bo.getShopId() != null, Employee::getShopId, bo.getShopId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), Employee::getPhonenumber, bo.getPhonenumber());
+        lqw.like(StringUtils.isNotBlank(bo.getPhonenumber()), Employee::getPhonenumber, bo.getPhonenumber());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Employee::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getPassword()), Employee::getPassword, bo.getPassword());
         return lqw;

ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/ShopServiceImpl.java

@@ -70,6 +70,7 @@ public class ShopServiceImpl implements IShopService {
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Shop::getAddress, bo.getAddress());
         lqw.like(StringUtils.isNotBlank(bo.getContact()), Shop::getContact, bo.getContact());
         lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), Shop::getPhonenumber, bo.getPhonenumber());
+        lqw.orderByDesc(Shop::getCreateTime);
         return lqw;
     }