1

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/ProjectMapper.xml

@@ -87,7 +87,7 @@
             <=
         </if>
         to_date(#{dateTime},'YYYY-MM-DD')
-        and person.fnumber = #{personNumber}
+        and person.fnumber = #{personNumber}  and CFSTATE = 1 and CFPROJECTSTATE in(1)
     </select>
     <select id="getMemberManagementInfoByPerobjectId" resultType="java.util.Map">
         select projectRole.fid                     as "projectRoleId",
@@ -120,12 +120,23 @@
         <!--                to_date(#{dateTime},'YYYY-MM-DD')-->
         <!--                  and CFProjectManagerID = (select fid from T_bd_person where fnumber = #{personNumber})-->
 
-        SELECT CFPROJECTMANAGEMENID as "id" ,
-        CFPROJECTCODE as "funumber" ,
-        CFPROJECTNAME as "name",
-        fid as "memberManagementId"
-        FROM CT_PRO_MemberManagement
-        where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber})
+        -- SELECT CFPROJECTMANAGEMENID as "id" ,
+        -- CFPROJECTCODE as "funumber" ,
+        -- CFPROJECTNAME as "name",
+        -- fid as "memberManagementId"
+        -- FROM CT_PRO_MemberManagement
+        -- where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber})
+
+        SELECT
+        projectManagement.fid as "id",
+        memberManagement.CFPROJECTCODE as "number",
+        memberManagement.CFPROJECTNAME as "name"
+        FROM CT_PRO_MemberManagement memberManagement
+        left join CT_PRO_ProjectManagement projectManagement on memberManagement.CFPROJECTMANAGEMENID =
+        projectManagement.fid
+        where CFEMPLOYEEId =(select fid from T_bd_person where fnumber =#{personNumber}) and CFSTATE = 1 and
+        CFPROJECTSTATE in(1)
+
     </select>
 
 </mapper>