Browse Source

政策-排序

yangzian 3 years ago
parent
commit
a6aacec93c

+ 7 - 6
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -340,10 +340,11 @@
             t.*,
             IFNULL( IF ( t.userid = 'legalAffairs', '法务人员', u.realname ), t.create_user_name ) userName,
             IF
-                ( t.userId = 'legalAffairs', '法务', r.role_name ) roleName
+                ( t.userId = 'legalAffairs', '法务', r.role_name ) roleName,
+            IF(t.createTime is NULL or t.createTime ='' ,1,10) sort
         FROM
             (
-                SELECT
+                (SELECT
                     l.id,
                     l.policy_id policyId,
                     l.approval_status approvalStatus,
@@ -363,9 +364,9 @@
                     `jeecg-boot`.`ctop_cwjs_policy_approval_log` l
                         LEFT JOIN `jeecg-boot`.ctop_cwjs_policy_info p ON l.policy_id = p.id
                 WHERE
-                    l.policy_id = #{policyId}
+                    l.policy_id = #{policyId})
                 UNION
-                SELECT
+                (SELECT
                     p.id,
                     p.id policyId,
                     '0' approvalStatus,
@@ -386,13 +387,13 @@
                 FROM
                     ctop_cwjs_policy_info p
                 WHERE
-                    p.id = #{policyId}
+                    p.id = #{policyId})
             ) t
                 LEFT JOIN `jeecg-boot`.sys_user u ON t.userid = u.id
                 LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
                 LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
         ORDER BY
-            id
+                 sort DESC,createTime
 
     </select>