From 479cf83506d8c6ba5053e4a9541a9cb665b513b8 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Tue, 16 May 2023 17:55:23 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20orgEomapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/report/vo/ReportCommentVo.class    | Bin 4767 -> 5264 bytes
 .../mapper/mysql/ReportUserCommentDao.xml     |   1 +
 .../mybatis/mapper/sys/mysql/OrgEOMapper.xml  |  31 +++++++-----------
 .../task/TaskController$1.class               | Bin 1922 -> 1922 bytes
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/adc-da-report/target/classes/com/adc/da/report/vo/ReportCommentVo.class b/adc-da-report/target/classes/com/adc/da/report/vo/ReportCommentVo.class
index 09210d5c87810e1a7d57c767c83ddbece2bee587..199c9d7acc86f454a81449742c9e7f1ec0c3a76a 100644
GIT binary patch
literal 5264
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

literal 4767
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

diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportUserCommentDao.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportUserCommentDao.xml
index 3ef4b1a..7d63568 100644
--- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportUserCommentDao.xml
+++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportUserCommentDao.xml
@@ -9,6 +9,7 @@
             ruc.id AS id,
             ruc.user_id AS userId,
             u.USNAME AS userName,
+            u.ACCOUNT AS account,
             ruc.comment AS comment,
             ruc.create_time AS createTime
         FROM
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml
index 525ca21..d0d8cd6 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml
@@ -4,23 +4,17 @@
 
     <!-- 查询条件 -->
     <sql id="Base_Where_Clause">
-        <if test="pageVO.orgCode != null and pageVO.orgCode !=''">
-            and org_code = #{pageVO.orgCode}
+        <if test="pageVO.DepartmentCode != null and pageVO.DepartmentCode !=''">
+            and DEPARTMENT_CODE = #{pageVO.DepartmentCode}
         </if>
-        <if test="pageVO.UUID != null and pageVO.UUID != ''">
-            and UUID =  #{pageVO.UUID}
+        <if test="pageVO.LongName != null and pageVO.LongName != ''">
+            and LONG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.LongName}) ,'%')
         </if>
-        <if test="pageVO.orgName != null and pageVO.orgName != ''">
-            and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%')
+        <if test="pageVO.LEVEL != null">
+            and LEVEL = #{pageVO.LEVEL}
         </if>
-        <if test="pageVO.orgLevel != null">
-            and ORG_LEVEL = #{pageVO.orgLevel}
-        </if>
-        <if test="pageVO.supOrgCode != null and pageVO.supOrgCode !=''">
-            and SUP_ORG_CODE = #{pageVO.supOrgCode}
-        </if>
-        <if test="pageVO.orgShortName != null and pageVO.orgShortName != ''">
-            and ORG_SHORT_NAME = #{pageVO.orgShortName}
+        <if test="pageVO.ParentID != null and pageVO.ParentID !=''">
+            and PARENT_ID = #{pageVO.ParentID}
         </if>
         <if test="pageVO.attribution != null and pageVO.attribution != ''">
             and ATTRIBUTION = #{pageVO.attribution}
@@ -28,9 +22,7 @@
         <if test="pageVO.bmdm14 != null and pageVO.bmdm14 != ''">
             and BMDM_14 = #{pageVO.bmdm14}
         </if>
-        <if test="pageVO.status != null">
-            and STATUS = #{pageVO.status}
-        </if>
+
     </sql>
 
     <select id="selectListByVO" resultType="com.adc.da.sys.entity.OrgEO">
@@ -48,9 +40,8 @@
     <select id="selectCountByOrgCode" resultType="java.lang.Long">
         select count(1) from TS_ORG
         <where>
-            status = 1
-            <if test="pageVO.orgCode != null and pageVO.orgCode != ''">
-                and org_code =  #{pageVO.orgCode}
+            <if test="pageVO.DepartmentCode != null and pageVO.DepartmentCode != ''">
+                and DEPARTMENT_CODE =  #{pageVO.DepartmentCode}
             </if>
             <if test="pageVO.id != null and pageVO.id != ''">
                 and id  !=  #{pageVO.id}
diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class
index 911f3d98714fd61cb81d9cf3aacaa0449e831883..0ca1924f662cd3511de182c80ff5edd47114269b 100644
GIT binary patch
delta 41
wcmZqTZ{pwZoR#tU<QJ^ng0C3(7+y2TGQ45XWO&P9!0>)@3)=>uoGH6606r%UwEzGB

delta 41
wcmZqTZ{pwZoR#tR<QJ^ng7+Bs816I3GCW|=WO&G6!0>o-3)=>uoGH6605|InVE_OC