Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -975,7 +975,7 @@ public class UserFacade extends UserServiceImpl {
     	if(userName != null && userName.length() != 0){
     		userInfo.setUserName(userName);
     	}
-        if(!autStatus.equals("")){
+        if(autStatus!=null){
             userInfo.setAutStatus(autStatus);
         }
         if(startTime != null && startTime.length() != 0){

user-service/src/main/resources/mapper/UserMapper.xml

@@ -498,7 +498,7 @@
 		a.is_deleted = "N"
 		AND a.id = #{amendOrg.orgId}
 	</update>
-	<select id="exportOrganization" parameterType="java.util.Map"
+	<select id="exportOrganizations" parameterType="java.util.Map"
             resultType="com.diagbot.dto.UserInfoDTO">
 	SELECT
         u.id AS userId,