Merge remote-tracking branch 'remotes/origin/dev_project_process'

3 years ago · 6e808cf108
1 changed files with 5 additions and 1 deletions
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@ -92,7 +92,11 @@
            ID AS processId,
            OPERATION_NAME AS processName,
            UNIX_TIMESTAMP(created_time) AS processTime,
-            CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')') AS "departmentName",
+            CASE
+                WHEN STAFF_NAME IS NULL THEN
+                    DEPARTMENT_NAME
+                ELSE CONCAT( DEPARTMENT_NAME, '(', STAFF_NAME, ')' )
+            END AS "departmentName",
            PUBLIC_REPLY,
            INTERNAL_REMARK,
            IS_SEND,