[修改] orgEomapper

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

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}