2024-01-24

系统优化

src/main/java/com/xujie/sys/modules/base/entity/Chooselist.java

@@ -20,10 +20,22 @@ public class Chooselist implements Serializable {
 
     private String caption4;
 
+    private String caption5;
+
+    private String caption6;
+
+    private String caption7;
+
     private String fieldname1;
 
     private String fieldname2;
 
+    private String fieldname3;
+
+    private String fieldname4;
+
+    private String fieldname5;
+
     private static final long serialVersionUID = 1L;
 
 

src/main/resources/mapper/factory/SiteMapper.xml

@@ -183,7 +183,9 @@
         SELECT
             a.site,
             a.bu_no,
-            a.bu_desc
+            dbo.get_bu_desc(a.site, a.bu_no) as buDesc,
+            a.department_id,
+            a.department_name
         FROM sys_department a
         LEFT JOIN Access_dept b ON b.username = #{username} and a.site = b.site and a.bu_no = b.bu_no and a.department_id = b.department_id
         <where>

src/main/resources/mapper/pms/EamMapper.xml

@@ -850,9 +850,12 @@
             left join operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
             left join eam_object as e on a.site = e.site and a.ObjectID = e.ObjectID and e.Active = 'Y' and a.bu_no = e.bu_no
             left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no
+            left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no
+            left join sys_user as ea on ead.username = ea.username
             <where>
                 a.site in (select site from eam_access_site where username = #{query.userName})
                 and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+                and ea.username = #{query.userName}
                 <if test="query.buDesc != null and query.buDesc != ''">
                     AND dbo.get_bu_desc ( a.site, a.bu_no ) = #{query.buDesc}
                 </if>
@@ -1394,9 +1397,14 @@
         from eam_defect_feedBack a
         left join eam_defect b on a.DefectID = b.DefectID
         left join operator as c on a.site = c.site and a.CreatedBy = c.operator_id
+        left join eam_object as e on a.site = e.site and a.ObjectID = e.ObjectID and e.Active = 'Y' and a.bu_no = e.bu_no
+        left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no
+        left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no
+        left join sys_user as ea on ead.username = ea.username
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            and ea.username = #{query.userName}
             <if test="query.feedBackID != null and query.feedBackID != ''">
             AND a.feedBackID like '%' + #{query.feedBackID} +'%'
             </if>