Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Michael_9527 8 years ago
parent
commit
61b456abdb

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -561,7 +561,7 @@
 	LEFT JOIN admin a on a.id = u.aid
 	where u.type = 1 and u.lvl > 0
 	<if test="unitName != null">
-	    and i.unit_name like  CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')
+	    and i.unit_name like  CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%') 
 	</if>
 	<if test="uid != null">
 	    and u.id = #{uid,jdbcType=VARCHAR}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1215,7 +1215,7 @@
 		organization_identity i on u.id = i.uid 
 		where
 		i.audit_status = 5
-		 and u.lvl = 1
+		 and u.lvl > 0
 		<if test="_parameter != null">
 			and u.aid = #{aid,jdbcType=VARCHAR}
 		</if>

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -104,9 +104,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	@Override
 	public List<OrgUnitNames> selectAllOrgIndentity() {
 		String aid = null;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			aid = TokenManager.getAdminId();
-		}
+		}*/
 		return organizationIdentityMapper.selectAllOrgIndentity(aid);
 	}