albertshaw 8 years ago
parent
commit
7d1350499b

+ 2 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -682,6 +682,7 @@
   	where a.deleted_sign = 0 and a.owner_type = 0
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="username != null">
   		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
@@ -732,6 +733,7 @@
   	where deleted_sign = 0 and owner_type = 0
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="username != null">
   		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')

+ 2 - 8
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -487,11 +487,7 @@
 	where d.deleted_sign = 0 and d.data_category = 0 
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
 		)
 	</if>
@@ -515,6 +511,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -558,11 +555,7 @@
 	where d.deleted_sign = 0 and d.data_category = 0 
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
 		)
 	</if>
@@ -586,6 +579,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}

+ 4 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -367,12 +367,14 @@
     	u.create_time as createTime, 
   	    u.number , 
   	    a.name as adminName, 
+  	    ma.name as managerName, 
   	    u.type,
   	    i.username, 
   	    i.audit_status as userAuditStatus,
   	    i.aft_username as aftUsername
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
+    LEFT JOIN admin ma on ma.id = u.mid 
 	LEFT JOIN user_identity i on u.id = i.uid
     where u.type = 0
     <if test="aid != null">
@@ -447,12 +449,14 @@
     	u.create_time as createTime, 
   	    u.number , 
   	    a.name as adminName, 
+  	    ma.name as managerName, 
   	    u.type,
   	    i.unit_name as unitName, 
   	    i.audit_status as orgAuditStatus,
   	    i.aft_username as aftUsername
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
+    LEFT JOIN admin ma on ma.id = u.mid 
 	LEFT JOIN organization_identity i on u.id = i.uid
     where u.type = 1
     <if test="aid != null">