wwl 4 lat temu
rodzic
commit
3704e56858

+ 3 - 5
hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoPcDTO.java

@@ -1,16 +1,11 @@
 package com.miaxis.school.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -24,6 +19,9 @@ import java.util.Date;
 public class SchoolInfoPcDTO extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     /**
      * 驾校全国统一编号
      */

+ 0 - 1
hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolInfoService.java

@@ -89,7 +89,6 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
     /**
      * pc查询列表
      */
-    @DataScope(deptAlias ="s")
     List<SchoolInfoPcVO> queryList(SchoolInfoPcDTO schoolInfoPcDTO);
 
     /**

+ 1 - 0
hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.miaxis.school.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataScope;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;

+ 2 - 2
hzgzpt-service/src/main/resources/mapper/school/SchoolInfoMapper.xml

@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- pc驾校列表查询 -->
     <select id="queryList" resultType="com.miaxis.school.vo.SchoolInfoPcVO">
         SELECT
-        s.`id` as dept_id,
+        s.`id`,
         s.`inscode`,
         s.`name`,
         s.`sname`,
@@ -246,7 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         school_info s
         <where>
-            <if test="deptId != null  and deptId != ''"> and s.id = #{deptId}</if>
+            <if test="id != null  and id != ''"> and s.id = #{id}</if>
             <if test="inscode != null  and inscode != ''"> and s.inscode = #{inscode}</if>
             <if test="name != null  and name != ''"> and s.`name` like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''"> and s.address = #{address}</if>