去除分页插件

src/main/resources/mapper_xml/DepotMapperEx.xml

@@ -5,60 +5,44 @@
         <result column="principalName" jdbcType="VARCHAR" property="principalName" />
     </resultMap>
 
-    <select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="com.jsh.erp.datasource.mappers.DepotMapper.BaseResultMap">
-        select *
-        FROM jsh_depot
+    <select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="ResultMapEx">
+        select dep.*,usr.username as principalName
+        FROM jsh_depot dep
+        left join jsh_user usr on usr.id=dep.principal and ifnull(usr.status,'0') not in('1','2')
         where 1=1
         <if test="name != null">
-            and name like '%${name}%'
+            and dep.name like '%${name}%'
         </if>
         <if test="type != null">
-            and type=${type}
+            and dep.type=${type}
         </if>
         <if test="remark != null">
-            and remark like '%${remark}%'
+            and dep.remark like '%${remark}%'
         </if>
-        and ifnull(delete_Flag,'0') !='1'
-        order by sort asc
+        and ifnull(dep.delete_Flag,'0') !='1'
+        order by dep.sort asc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>
     </select>
     <select id="countsByDepot" resultType="java.lang.Long">
         SELECT
-        COUNT(id)
-        FROM jsh_depot
-        WHERE 1=1
-        <if test="name != null">
-            and name like '%${name}%'
-        </if>
-        <if test="type != null">
-            and type=${type}
-        </if>
-        <if test="remark != null">
-            and remark like '%${remark}%'
-        </if>
-        and ifnull(delete_Flag,'0') !='1'
-    </select>
-    <select id="getDepotList" parameterType="java.util.Map" resultMap="ResultMapEx">
-        select dep.*,usr.username as principalName
+        COUNT(dep.id)
         FROM jsh_depot dep
         left join jsh_user usr on usr.id=dep.principal and ifnull(usr.status,'0') not in('1','2')
-        where 1=1
-        <if test="name != null and name != ''">
-            <bind name="name" value="'%' + _parameter.name + '%'" />
-            and dep.name like #{name}
+        WHERE 1=1
+        <if test="name != null">
+            and dep.name like '%${name}%'
         </if>
-        <if test="type != null and type != ''">
-            and dep.type=#{type}
+        <if test="type != null">
+            and dep.type=${type}
         </if>
-        <if test="remark != null and remark != ''">
-            <bind name="remark" value="'%' + _parameter.remark + '%'" />
-            and dep.remark like #{remark}
+        <if test="remark != null">
+            and dep.remark like '%${remark}%'
         </if>
         and ifnull(dep.delete_Flag,'0') !='1'
-        order by dep.sort asc
     </select>
+
     <update id="batchDeleteDepotByIds">
         update jsh_depot
         set delete_Flag='1'

src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -161,6 +161,7 @@
         and ifnull(m.delete_Flag,'0') !='1'
 
     </select>
+
     <select id="getMaterialEnableSerialNumberList" parameterType="java.util.Map" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
         select
         Id, CategoryId, name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark,
@@ -181,6 +182,24 @@
         and ifnull(delete_Flag,'0') !='1'
         order by id desc
     </select>
+
+    <select id="getMaterialEnableSerialNumberCount" resultType="java.lang.Long">
+        select count(1)
+        FROM jsh_material
+        where 1=1
+        and enabled ='1'
+        and enableSerialNumber ='1'
+        <if test="name != null and name != ''">
+            <bind name="name" value="'%' + _parameter.name + '%'" />
+            and name like #{name}
+        </if>
+        <if test="model != null and model != ''">
+            <bind name="model" value="'%' + _parameter.model + '%'" />
+            and model like #{model}
+        </if>
+        and ifnull(delete_Flag,'0') !='1'
+    </select>
+
     <update id="batchDeleteMaterialByIds">
         update jsh_material
         set delete_Flag='1'

src/main/resources/mapper_xml/UserMapperEx.xml

@@ -7,52 +7,39 @@
         <result column="user_blng_orga_dspl_seq" jdbcType="VARCHAR" property="userBlngOrgaDsplSeq" />
         <result column="orgaUserRelId" jdbcType="BIGINT" property="orgaUserRelId" />
     </resultMap>
-    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
-        select *
-        FROM jsh_user
-        where 1=1
-        and ifnull(status,'0') not in('1','2')
-        <if test="userName != null">
-            and username like '%${userName}%'
-        </if>
-        <if test="loginName != null">
-            and login_name like '%${loginName}%'
-        </if>
-        <if test="offset != null and rows != null">
-            limit #{offset},#{rows}
-        </if>
-    </select>
-    <select id="countsByUser" resultType="java.lang.Long">
-        SELECT
-        COUNT(id)
-        FROM jsh_user
-        WHERE 1=1
-        and ifnull(status,'0') not in('1','2')
-        <if test="userName != null">
-            and username like '%${userName}%'
-        </if>
-        <if test="loginName != null">
-            and login_name like '%${loginName}%'
-        </if>
-    </select>
-    <select id="getUserList" parameterType="java.util.Map" resultMap="ResultMapEx">
+    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="ResultMapEx">
         select user.id, user.username, user.login_name, user.position, user.email, user.phonenum,
-         user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq,
+        user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq,
         rel.id as orgaUserRelId
         FROM jsh_user user
         left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
         left join jsh_organization org on rel.orga_id=org.id and  ifnull(org.org_stcd,'0') !='5'
         where 1=1
         and ifnull(user.status,'0') not in('1','2')
-        <if test="userName != null and userName != ''">
-            <bind name="userName" value="'%' + _parameter.userName + '%'" />
-            and user.username like #{userName}
+        <if test="userName != null">
+            and user.username like '%${userName}%'
         </if>
-        <if test="loginName != null and loginName != ''">
-            <bind name="loginName" value="'%' + _parameter.loginName + '%'" />
-            and user.login_name like #{loginName}
+        <if test="loginName != null">
+            and user.login_name like '%${loginName}%'
         </if>
         order by user.id desc
+        <if test="offset != null and rows != null">
+            limit #{offset},#{rows}
+        </if>
+    </select>
+    <select id="countsByUser" resultType="java.lang.Long">
+        select count(user.id)
+        FROM jsh_user user
+        left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
+        left join jsh_organization org on rel.orga_id=org.id and  ifnull(org.org_stcd,'0') !='5'
+        where 1=1
+        and ifnull(user.status,'0') not in('1','2')
+        <if test="userName != null">
+            and user.username like '%${userName}%'
+        </if>
+        <if test="loginName != null">
+            and user.login_name like '%${loginName}%'
+        </if>
     </select>
     <select id="getUserListByUserNameOrLoginName" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
         select user.id, user.username, user.login_name, user.position, user.email, user.phonenum,