Merge remote-tracking branch 'origin/20210223' into 20210223

user_center/src/main/resources/mapper/UserMapper.xml

@@ -353,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or a.COMPANY_ORG_ID = #{user.companyOrgId}
                 )
             </if>
-            <if test="user.userType!=null and user.userType!=-999 and user.userType!=-9999 and  user.programItems != null and user.programItems.size() > 0">
+            <if test="user.userType!=-999 and user.userType!=-9999 and  user.programItems != null and user.programItems.size() > 0">
                 <if test="user.permissonType == 5 or user.permissonType == 2">
                     and ( a.DEPT_ORG_ID in
                     <foreach collection="user.programItems" item="item" open="(" close=")" separator=",">