Merge remote-tracking branch 'origin/develop_1' into develop_master

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
2021-07-09 14:33:21 +08:00
parent 952c3ab02a 2ee918e1d0
commit aed855e336
7 changed files with 31 additions and 14 deletions
@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao">

+
+    <select id="queryProjectManager" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
+        select s.product_line,t.UNAME as uName
+        from sar_stand_project_library s
+        INNER JOIN ts_user t
+        ON s.project_manager=t.USID
+        GROUP BY s.product_line
+        limit #{current},#{pageSize}
+    </select>
 </mapper>